2:40 a.m.
Error messages are exempt from the 80 columns rule. Move them
onto one line.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/remote/remote_daemon.c | 3 +--
src/remote/remote_driver.c | 27 +++++++++------------------
src/remote/remote_sockets.c | 3 +--
3 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index d4d999e53a..657c053f6f 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -219,8 +219,7 @@ daemonSetupNetworking(virNetServer *srv,
#ifdef WITH_IP
# ifdef LIBVIRTD
if (act && ipsock) {
- VIR_ERROR(_("--listen parameter not permitted with systemd activation
"
- "sockets, see 'man libvirtd' for further
guidance"));
+ VIR_ERROR(_("--listen parameter not permitted with systemd activation
sockets, see 'man libvirtd' for further guidance"));
return -1;
}
# else /* ! LIBVIRTD */
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index faad7292ed..2f8c9800a7 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1103,8 +1103,7 @@ doRemoteOpen(virConnectPtr conn,
case REMOTE_DRIVER_TRANSPORT_SSH:
case REMOTE_DRIVER_TRANSPORT_EXT:
virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("transport methods unix, ssh and ext are not supported
"
- "under Windows"));
+ _("transport methods unix, ssh and ext are not supported
under Windows"));
goto error;
#endif /* WIN32 */
@@ -1478,8 +1477,7 @@ remoteNodeGetCPUStats(virConnectPtr conn,
if (ret.params.params_len > REMOTE_NODE_CPU_STATS_MAX ||
ret.params.params_len > *nparams) {
virReportError(VIR_ERR_RPC, "%s",
- _("remoteNodeGetCPUStats: "
- "returned number of stats exceeds limit"));
+ _("remoteNodeGetCPUStats: returned number of stats exceeds
limit"));
goto cleanup;
}
/* 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 ||
ret.params.params_len > *nparams) {
virReportError(VIR_ERR_RPC, "%s",
- _("remoteNodeGetMemoryStats: "
- "returned number of stats exceeds limit"));
+ _("remoteNodeGetMemoryStats: returned number of stats exceeds
limit"));
goto cleanup;
}
/* 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 ||
ret.params.params_len > *nparams) {
virReportError(VIR_ERR_RPC, "%s",
- _("remoteDomainBlockStatsFlags: "
- "returned number of stats exceeds limit"));
+ _("remoteDomainBlockStatsFlags: returned number of stats
exceeds limit"));
goto cleanup;
}
@@ -2760,8 +2756,7 @@ static int remoteDomainGetCPUStats(virDomainPtr domain,
(ret.params.params_len &&
((ret.params.params_len % ret.nparams) || ret.nparams > nparams))) {
virReportError(VIR_ERR_RPC, "%s",
- _("remoteDomainGetCPUStats: "
- "returned number of stats exceeds limit"));
+ _("remoteDomainGetCPUStats: returned number of stats exceeds
limit"));
memset(params, 0, sizeof(*params) * nparams * ncpus);
goto cleanup;
}
@@ -6114,8 +6109,7 @@ remoteConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned
int count)
if (!virNetClientKeepAliveIsSupported(priv->client)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("the caller doesn't support keepalive protocol;"
- " perhaps it's missing event loop
implementation"));
+ _("the caller doesn't support keepalive protocol; perhaps
it's missing event loop implementation"));
return -1;
}
@@ -7562,8 +7556,7 @@ remoteDomainAuthorizedSSHKeysGet(virDomainPtr domain,
if (ret.keys.keys_len > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) {
virReportError(VIR_ERR_RPC, "%s",
- _("remoteDomainAuthorizedSSHKeysGet: "
- "returned number of keys exceeds limit"));
+ _("remoteDomainAuthorizedSSHKeysGet: returned number of keys
exceeds limit"));
goto cleanup;
}
@@ -7592,8 +7585,7 @@ remoteDomainAuthorizedSSHKeysSet(virDomainPtr domain,
if (nkeys > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) {
virReportError(VIR_ERR_RPC, "%s",
- _("remoteDomainAuthorizedSSHKeysSet: "
- "returned number of keys exceeds limit"));
+ _("remoteDomainAuthorizedSSHKeysSet: returned number of keys
exceeds limit"));
return -1;
}
@@ -7635,8 +7627,7 @@ remoteDomainGetMessages(virDomainPtr domain,
if (ret.msgs.msgs_len > REMOTE_DOMAIN_MESSAGES_MAX) {
virReportError(VIR_ERR_RPC, "%s",
- _("remoteDomainGetMessages: "
- "returned number of msgs exceeds limit"));
+ _("remoteDomainGetMessages: returned number of msgs exceeds
limit"));
goto cleanup;
}
diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c
index 9c1944209f..4ab3d72933 100644
--- a/src/remote/remote_sockets.c
+++ b/src/remote/remote_sockets.c
@@ -96,8 +96,7 @@ remoteSplitURIScheme(virURI *uri,
if ((val = remoteDriverTransportTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("remote_open: transport in URL not recognised "
- "(should be
tls|unix|ssh|ext|tcp|libssh2|libssh)"));
+ _("remote_open: transport in URL not recognised (should
be tls|unix|ssh|ext|tcp|libssh2|libssh)"));
return -1;
}
--
2.41.0