From nobody Mon Feb 9 09:34:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692949393; cv=none; d=zohomail.com; s=zohoarc; b=RFaYH/LFtg2TjOgeYJrJGPwWX4LnNky2yM2U7hgq+xtQxzzyVc09iO8KdFFBEDfioDTQ8qD/m1Tu2EnkIfsnB/Wmh85TQ19b5Iryiyaki6vUkCbXkU7rKqfPEyRZ9uhR5p8ccCIuIcGKoHihy20vNMBvpXATb+MhoZBAIJ705p4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949393; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+kHUCCroMB0nvo9fGo9yLmBGkgTMNu8YlOdW+ubd0oI=; b=gjC7qYs9BetqV3NbUJ7UwgTGtQuPSKaUALrzcjzcUG6AePisA+VG+okgM9xwjMo44qSnbZQJKJyuLirYRPNKbckJYPSWQwyB8yqGTJU9+4KQre1qL0VouMzYtA197Ek2QKWbIAlgaxXKQqW2rQDu8E5RUsbnc1MuDhL7qPCLsjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1692949393164996.6248049057265; Fri, 25 Aug 2023 00:43:13 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-AqUIIAvbPu-Nkw4OVBsftw-1; Fri, 25 Aug 2023 03:40:52 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7486E108BDCC; Fri, 25 Aug 2023 07:40:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FD56492C18; Fri, 25 Aug 2023 07:40:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 534E719465B8; Fri, 25 Aug 2023 07:40:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A10481946589 for ; Fri, 25 Aug 2023 07:40:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 925622026D76; Fri, 25 Aug 2023 07:40:35 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 398122026D68 for ; Fri, 25 Aug 2023 07:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949392; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+kHUCCroMB0nvo9fGo9yLmBGkgTMNu8YlOdW+ubd0oI=; b=i0qotq+j24nT5b5OiHJ+iGNuj7BewQhE011YSdFagmZn+RSCFO3MACZ8U81VF6atqeidzf v2T1LCjs8nV8S+qFfsbwrxQE/+Atlx5ejGYhApEyUsEXKIPBUA/m7seOZo7kMU+PGaXKy3 /25AHxYzf3HMS89eTkDqQPL/4lewBcA= X-MC-Unique: AqUIIAvbPu-Nkw4OVBsftw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 15/27] remote: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:12 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692949394043100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Error messages are exempt from the 80 columns rule. Move them onto one line. Signed-off-by: Michal Privoznik --- 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 activat= ion " - "sockets, see 'man libvirtd' for further guidance")); + VIR_ERROR(_("--listen parameter not permitted with systemd activat= ion 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 supp= orted " - "under Windows")); + _("transport methods unix, ssh and ext are not supp= orted under Windows")); goto error; =20 #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 sta= ts 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; } =20 @@ -2760,8 +2756,7 @@ static int remoteDomainGetCPUStats(virDomainPtr domai= n, (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 stat= s exceeds limit")); memset(params, 0, sizeof(*params) * nparams * ncpus); goto cleanup; } @@ -6114,8 +6109,7 @@ remoteConnectSetKeepAlive(virConnectPtr conn, int int= erval, unsigned int count) =20 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; p= erhaps it's missing event loop implementation")); return -1; } =20 @@ -7562,8 +7556,7 @@ remoteDomainAuthorizedSSHKeysGet(virDomainPtr domain, =20 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 numbe= r of keys exceeds limit")); goto cleanup; } =20 @@ -7592,8 +7585,7 @@ remoteDomainAuthorizedSSHKeysSet(virDomainPtr domain, =20 if (nkeys > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) { virReportError(VIR_ERR_RPC, "%s", - _("remoteDomainAuthorizedSSHKeysSet: " - "returned number of keys exceeds limit")); + _("remoteDomainAuthorizedSSHKeysSet: returned numbe= r of keys exceeds limit")); return -1; } =20 @@ -7635,8 +7627,7 @@ remoteDomainGetMessages(virDomainPtr domain, =20 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; } =20 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, =20 if ((val =3D remoteDriverTransportTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("remote_open: transport in URL not recognised= " - "(should be tls|unix|ssh|ext|tcp|libssh2|libs= sh)")); + _("remote_open: transport in URL not recognised= (should be tls|unix|ssh|ext|tcp|libssh2|libssh)")); return -1; } =20 --=20 2.41.0