[PATCH 19/27] storage_file: 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/storage_file/storage_source.c | 3 +- .../storage_source_backingstore.c | 36 +++++++------------ 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_source.c index 3c50239e29..b97bbde619 100644 --- a/src/storage_file/storage_source.c +++ b/src/storage_file/storage_source.c @@ -762,8 +762,7 @@ virStorageSourceGetRelativeBackingPath(virStorageSource *top, if (next != base) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to resolve relative backing name: " - "base image is not in backing chain")); + _("failed to resolve relative backing name: base image is not in backing chain")); return -1; } diff --git a/src/storage_file/storage_source_backingstore.c b/src/storage_file/storage_source_backingstore.c index a4ee2a5d78..00fcfe9fd7 100644 --- a/src/storage_file/storage_source_backingstore.c +++ b/src/storage_file/storage_source_backingstore.c @@ -441,8 +441,7 @@ virStorageSourceParseBackingJSONPath(virStorageSource *src, if (!(path = virJSONValueObjectGetString(json, "filename"))) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing 'filename' field in JSON backing volume " - "definition")); + _("missing 'filename' field in JSON backing volume definition")); return -1; } @@ -597,8 +596,7 @@ virStorageSourceParseBackingJSONInetSocketAddress(virStorageNetHostDef *host, if (!json) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing remote server specification in JSON " - "backing volume definition")); + _("missing remote server specification in JSON backing volume definition")); return -1; } @@ -607,8 +605,7 @@ virStorageSourceParseBackingJSONInetSocketAddress(virStorageNetHostDef *host, if (!hostname) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing hostname for tcp backing server in " - "JSON backing volume definition")); + _("missing hostname for tcp backing server in JSON backing volume definition")); return -1; } @@ -631,15 +628,13 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDef *host, if (!json) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing remote server specification in JSON " - "backing volume definition")); + _("missing remote server specification in JSON backing volume definition")); return -1; } if (!(type = virJSONValueObjectGetString(json, "type"))) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing socket address type in " - "JSON backing volume definition")); + _("missing socket address type in JSON backing volume definition")); return -1; } @@ -657,8 +652,7 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDef *host, if (!socket) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing socket path for udp backing server in " - "JSON backing volume definition")); + _("missing socket path for udp backing server in JSON backing volume definition")); return -1; } @@ -694,8 +688,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSource *src, if (!volume || !path || !server) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing 'volume', 'path' or 'server' attribute in " - "JSON backing definition for gluster volume")); + _("missing 'volume', 'path' or 'server' attribute in JSON backing definition for gluster volume")); return -1; } @@ -708,8 +701,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSource *src, nservers = virJSONValueArraySize(server); if (nservers == 0) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("at least 1 server is necessary in " - "JSON backing definition for gluster volume")); + _("at least 1 server is necessary in JSON backing definition for gluster volume")); return -1; } @@ -809,8 +801,7 @@ virStorageSourceParseBackingJSONNbd(virStorageSource *src, if (!path && !host && !server) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing host specification of NBD server in JSON " - "backing volume definition")); + _("missing host specification of NBD server in JSON backing volume definition")); return -1; } @@ -899,8 +890,7 @@ virStorageSourceParseBackingJSONSSH(virStorageSource *src, if (!(host || server) || !path) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing host/server or path of SSH JSON backing " - "volume definition")); + _("missing host/server or path of SSH JSON backing volume definition")); return -1; } @@ -957,8 +947,7 @@ virStorageSourceParseBackingJSONRBD(virStorageSource *src, if (!pool || !image) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing pool or image name in ceph backing volume " - "JSON specification")); + _("missing pool or image name in ceph backing volume JSON specification")); return -1; } @@ -1034,8 +1023,7 @@ virStorageSourceParseBackingJSONVxHS(virStorageSource *src, if (!vdisk_id || !server) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing 'vdisk-id' or 'server' attribute in " - "JSON backing definition for VxHS volume")); + _("missing 'vdisk-id' or 'server' attribute in JSON backing definition for VxHS volume")); return -1; } -- 2.41.0