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 <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 19d4f92728bc3ff39607bbf7b9005c2969a957bb..21220661f712fc451ef7d49ae9308f5d35dbabe0 100644 (file)
--- 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 f284798f1ca06afbe3125902ad541a1b72c79472..f3d3e4eb504b0e8990b6976bfd8918c458de4c2a 100644 (file)
--- 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 0ae208ef111d3c77a356018d3df5dc006e000f6d..5a63efc35fd59fb3fac950e4e9802096d39fa35b 100644 (file)
--- 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 04642b56ddb0bcef20b139525234a2602b74d8ff..20cd3a3d5753ed301a194bf19a34d49078215bcf 100644 (file)
--- 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;
     }