External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_file: Move error messages onto a single line

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2023-08-24 17:03:59 +02:00
parent 5674fa48d1
commit a3b1b2a6aa
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/storage_file/storage_source.c
View File

@ -762,8 +762,7 @@ virStorageSourceGetRelativeBackingPath(virStorageSource *top,
if (next != base) { if (next != base) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to resolve relative backing name: " _("failed to resolve relative backing name: base image is not in backing chain"));
"base image is not in backing chain"));
return -1; return -1;
} }

36
src/storage_file/storage_source_backingstore.c
View File

@ -441,8 +441,7 @@ virStorageSourceParseBackingJSONPath(virStorageSource *src,
if (!(path = virJSONValueObjectGetString(json, "filename"))) { if (!(path = virJSONValueObjectGetString(json, "filename"))) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing 'filename' field in JSON backing volume " _("missing 'filename' field in JSON backing volume definition"));
"definition"));
return -1; return -1;
} }
@ -597,8 +596,7 @@ virStorageSourceParseBackingJSONInetSocketAddress(virStorageNetHostDef *host,
if (!json) { if (!json) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing remote server specification in JSON " _("missing remote server specification in JSON backing volume definition"));
"backing volume definition"));
return -1; return -1;
} }
@ -607,8 +605,7 @@ virStorageSourceParseBackingJSONInetSocketAddress(virStorageNetHostDef *host,
if (!hostname) { if (!hostname) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing hostname for tcp backing server in " _("missing hostname for tcp backing server in JSON backing volume definition"));
"JSON backing volume definition"));
return -1; return -1;
} }
@ -631,15 +628,13 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDef *host,
if (!json) { if (!json) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing remote server specification in JSON " _("missing remote server specification in JSON backing volume definition"));
"backing volume definition"));
return -1; return -1;
} }
if (!(type = virJSONValueObjectGetString(json, "type"))) { if (!(type = virJSONValueObjectGetString(json, "type"))) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing socket address type in " _("missing socket address type in JSON backing volume definition"));
"JSON backing volume definition"));
return -1; return -1;
} }
@ -657,8 +652,7 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDef *host,
if (!socket) { if (!socket) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing socket path for udp backing server in " _("missing socket path for udp backing server in JSON backing volume definition"));
"JSON backing volume definition"));
return -1; return -1;
} }
@ -694,8 +688,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSource *src,
if (!volume || !path || !server) { if (!volume || !path || !server) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing 'volume', 'path' or 'server' attribute in " _("missing 'volume', 'path' or 'server' attribute in JSON backing definition for gluster volume"));
"JSON backing definition for gluster volume"));
return -1; return -1;
} }
@ -708,8 +701,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSource *src,
nservers = virJSONValueArraySize(server); nservers = virJSONValueArraySize(server);
if (nservers == 0) { if (nservers == 0) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("at least 1 server is necessary in " _("at least 1 server is necessary in JSON backing definition for gluster volume"));
"JSON backing definition for gluster volume"));
return -1; return -1;
} }
@ -809,8 +801,7 @@ virStorageSourceParseBackingJSONNbd(virStorageSource *src,
if (!path && !host && !server) { if (!path && !host && !server) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing host specification of NBD server in JSON " _("missing host specification of NBD server in JSON backing volume definition"));
"backing volume definition"));
return -1; return -1;
} }
@ -899,8 +890,7 @@ virStorageSourceParseBackingJSONSSH(virStorageSource *src,
if (!(host || server) || !path) { if (!(host || server) || !path) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing host/server or path of SSH JSON backing " _("missing host/server or path of SSH JSON backing volume definition"));
"volume definition"));
return -1; return -1;
} }
@ -957,8 +947,7 @@ virStorageSourceParseBackingJSONRBD(virStorageSource *src,
if (!pool || !image) { if (!pool || !image) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing pool or image name in ceph backing volume " _("missing pool or image name in ceph backing volume JSON specification"));
"JSON specification"));
return -1; return -1;
} }
@ -1034,8 +1023,7 @@ virStorageSourceParseBackingJSONVxHS(virStorageSource *src,
if (!vdisk_id || !server) { if (!vdisk_id || !server) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing 'vdisk-id' or 'server' attribute in " _("missing 'vdisk-id' or 'server' attribute in JSON backing definition for VxHS volume"));
"JSON backing definition for VxHS volume"));
return -1; return -1;
} }