From 8e48b9a31304ef0c22a3c4e785a83485dec2000b Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 24 Aug 2023 17:03:58 +0200 Subject: [PATCH] lxc: Move error messages onto a single line Error messages are exempt from the 80 columns rule. Move them onto one line. Signed-off-by: Michal Privoznik Reviewed-by: Pavel Hrdina --- src/lxc/lxc_container.c | 3 +-- src/lxc/lxc_driver.c | 3 +-- src/lxc/lxc_native.c | 3 +-- src/lxc/lxc_process.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 19d4f92728..21220661f7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2182,8 +2182,7 @@ int lxcContainerStart(virDomainDef *def, } else { if (lxcNeedNetworkNamespace(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Config asks for inherit net namespace " - "as well as private network interfaces")); + _("Config asks for inherit net namespace as well as private network interfaces")); goto cleanup; } VIR_DEBUG("Inheriting a net namespace"); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index f284798f1c..f3d3e4eb50 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -654,8 +654,7 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, if (flags & VIR_DOMAIN_MEM_MAXIMUM) { if (def) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Cannot resize the max memory " - "on an active domain")); + _("Cannot resize the max memory on an active domain")); goto endjob; } diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 0ae208ef11..5a63efc35f 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1126,8 +1126,7 @@ lxcParseConfigString(const char *config, if (virConfGetValue(properties, "lxc.mount.fstab") || virConfGetValue(properties, "lxc.mount")) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("lxc.mount.fstab or lxc.mount found, use " - "lxc.mount.entry lines instead")); + _("lxc.mount.fstab or lxc.mount found, use lxc.mount.entry lines instead")); return NULL; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 04642b56dd..20cd3a3d57 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -452,8 +452,7 @@ static int virLXCProcessSetupNamespaceNet(int ns_type, const char *name) int fd; if (ns_type != VIR_LXC_DOMAIN_NAMESPACE_SHARENET) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'netns' namespace source can only be " - "used with sharenet")); + _("'netns' namespace source can only be used with sharenet")); return -1; }