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

remote: 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 895525db81
commit 6c67e66c83
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/remote/remote_daemon.c
View File

@ -219,8 +219,7 @@ daemonSetupNetworking(virNetServer *srv,
#ifdef WITH_IP #ifdef WITH_IP
# ifdef LIBVIRTD # ifdef LIBVIRTD
if (act && ipsock) { if (act && ipsock) {
VIR_ERROR(_("--listen parameter not permitted with systemd activation " VIR_ERROR(_("--listen parameter not permitted with systemd activation sockets, see 'man libvirtd' for further guidance"));
"sockets, see 'man libvirtd' for further guidance"));
return -1; return -1;
} }
# else /* ! LIBVIRTD */ # else /* ! LIBVIRTD */

27
src/remote/remote_driver.c
View File

@ -1103,8 +1103,7 @@ doRemoteOpen(virConnectPtr conn,
case REMOTE_DRIVER_TRANSPORT_SSH: case REMOTE_DRIVER_TRANSPORT_SSH:
case REMOTE_DRIVER_TRANSPORT_EXT: case REMOTE_DRIVER_TRANSPORT_EXT:
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("transport methods unix, ssh and ext are not supported " _("transport methods unix, ssh and ext are not supported under Windows"));
"under Windows"));
goto error; goto error;
#endif /* WIN32 */ #endif /* WIN32 */
@ -1478,8 +1477,7 @@ remoteNodeGetCPUStats(virConnectPtr conn,
if (ret.params.params_len > REMOTE_NODE_CPU_STATS_MAX || if (ret.params.params_len > REMOTE_NODE_CPU_STATS_MAX ||
ret.params.params_len > *nparams) { ret.params.params_len > *nparams) {
virReportError(VIR_ERR_RPC, "%s", virReportError(VIR_ERR_RPC, "%s",
_("remoteNodeGetCPUStats: " _("remoteNodeGetCPUStats: returned number of stats exceeds limit"));
"returned number of stats exceeds limit"));
goto cleanup; goto cleanup;
} }
/* Handle the case when the caller does not know the number of stats /* Handle the case when the caller does not know the number of stats
@ -1538,8 +1536,7 @@ remoteNodeGetMemoryStats(virConnectPtr conn,
if (ret.params.params_len > REMOTE_NODE_MEMORY_STATS_MAX || if (ret.params.params_len > REMOTE_NODE_MEMORY_STATS_MAX ||
ret.params.params_len > *nparams) { ret.params.params_len > *nparams) {
virReportError(VIR_ERR_RPC, "%s", virReportError(VIR_ERR_RPC, "%s",
_("remoteNodeGetMemoryStats: " _("remoteNodeGetMemoryStats: returned number of stats exceeds limit"));
"returned number of stats exceeds limit"));
goto cleanup; goto cleanup;
} }
/* Handle the case when the caller does not know the number of stats /* Handle the case when the caller does not know the number of stats
@ -1703,8 +1700,7 @@ remoteDomainBlockStatsFlags(virDomainPtr domain,
if (ret.params.params_len > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX || if (ret.params.params_len > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX ||
ret.params.params_len > *nparams) { ret.params.params_len > *nparams) {
virReportError(VIR_ERR_RPC, "%s", virReportError(VIR_ERR_RPC, "%s",
_("remoteDomainBlockStatsFlags: " _("remoteDomainBlockStatsFlags: returned number of stats exceeds limit"));
"returned number of stats exceeds limit"));
goto cleanup; goto cleanup;
} }
@ -2760,8 +2756,7 @@ static int remoteDomainGetCPUStats(virDomainPtr domain,
(ret.params.params_len && (ret.params.params_len &&
((ret.params.params_len % ret.nparams) || ret.nparams > nparams))) { ((ret.params.params_len % ret.nparams) || ret.nparams > nparams))) {
virReportError(VIR_ERR_RPC, "%s", virReportError(VIR_ERR_RPC, "%s",
_("remoteDomainGetCPUStats: " _("remoteDomainGetCPUStats: returned number of stats exceeds limit"));
"returned number of stats exceeds limit"));
memset(params, 0, sizeof(*params) * nparams * ncpus); memset(params, 0, sizeof(*params) * nparams * ncpus);
goto cleanup; goto cleanup;
} }
@ -6114,8 +6109,7 @@ remoteConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned int count)
if (!virNetClientKeepAliveIsSupported(priv->client)) { if (!virNetClientKeepAliveIsSupported(priv->client)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("the caller doesn't support keepalive protocol;" _("the caller doesn't support keepalive protocol; perhaps it's missing event loop implementation"));
" perhaps it's missing event loop implementation"));
return -1; return -1;
} }
@ -7562,8 +7556,7 @@ remoteDomainAuthorizedSSHKeysGet(virDomainPtr domain,
if (ret.keys.keys_len > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) { if (ret.keys.keys_len > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) {
virReportError(VIR_ERR_RPC, "%s", virReportError(VIR_ERR_RPC, "%s",
_("remoteDomainAuthorizedSSHKeysGet: " _("remoteDomainAuthorizedSSHKeysGet: returned number of keys exceeds limit"));
"returned number of keys exceeds limit"));
goto cleanup; goto cleanup;
} }
@ -7592,8 +7585,7 @@ remoteDomainAuthorizedSSHKeysSet(virDomainPtr domain,
if (nkeys > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) { if (nkeys > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) {
virReportError(VIR_ERR_RPC, "%s", virReportError(VIR_ERR_RPC, "%s",
_("remoteDomainAuthorizedSSHKeysSet: " _("remoteDomainAuthorizedSSHKeysSet: returned number of keys exceeds limit"));
"returned number of keys exceeds limit"));
return -1; return -1;
} }
@ -7635,8 +7627,7 @@ remoteDomainGetMessages(virDomainPtr domain,
if (ret.msgs.msgs_len > REMOTE_DOMAIN_MESSAGES_MAX) { if (ret.msgs.msgs_len > REMOTE_DOMAIN_MESSAGES_MAX) {
virReportError(VIR_ERR_RPC, "%s", virReportError(VIR_ERR_RPC, "%s",
_("remoteDomainGetMessages: " _("remoteDomainGetMessages: returned number of msgs exceeds limit"));
"returned number of msgs exceeds limit"));
goto cleanup; goto cleanup;
} }

3
src/remote/remote_sockets.c
View File

@ -96,8 +96,7 @@ remoteSplitURIScheme(virURI *uri,
if ((val = remoteDriverTransportTypeFromString(tmp)) < 0) { if ((val = remoteDriverTransportTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("remote_open: transport in URL not recognised " _("remote_open: transport in URL not recognised (should be tls|unix|ssh|ext|tcp|libssh2|libssh)"));
"(should be tls|unix|ssh|ext|tcp|libssh2|libssh)"));
return -1; return -1;
} }