[PATCH 23/27] vmware: 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(a)redhat.com&gt; --- src/vmware/vmware_conf.c | 9 +++------ src/vmware/vmware_driver.c | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ba4e4d28dc..a598b512dc 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -355,8 +355,7 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) */ if (vmdef->ndisks < 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Domain XML doesn't contain any disks, " - "cannot deduce datastore and path for VMX file")); + _("Domain XML doesn't contain any disks, cannot deduce datastore and path for VMX file")); return -1; } @@ -370,16 +369,14 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) if (disk == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Domain XML doesn't contain any file-based harddisks, " - "cannot deduce datastore and path for VMX file")); + _("Domain XML doesn't contain any file-based harddisks, cannot deduce datastore and path for VMX file")); return -1; } src = virDomainDiskGetSource(disk); if (!src) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("First file-based harddisk has no source, cannot " - "deduce datastore and path for VMX file")); + _("First file-based harddisk has no source, cannot deduce datastore and path for VMX file")); return -1; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 259d00cacd..416ce126e8 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -509,8 +509,7 @@ vmwareDomainSuspend(virDomainPtr dom) if (driver->type == VMWARE_DRIVER_PLAYER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("vmplayer does not support libvirt suspend/resume" - " (vmware pause/unpause) operation ")); + _("vmplayer does not support libvirt suspend/resume (vmware pause/unpause) operation ")); return ret; } @@ -549,8 +548,7 @@ vmwareDomainResume(virDomainPtr dom) if (driver->type == VMWARE_DRIVER_PLAYER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("vmplayer does not support libvirt suspend/resume " - "(vmware pause/unpause) operation ")); + _("vmplayer does not support libvirt suspend/resume (vmware pause/unpause) operation ")); return ret; } -- 2.41.0