From nobody Mon Feb 9 12:42:32 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=1692949325; cv=none; d=zohomail.com; s=zohoarc; b=ddi/uTNJ3DM+N6ST6BP/8ajB7sgt8yvJQ07UNh87bm7GugV0zpDnd+gKrM7ohx93ITdVYw1ygyjFFUwV5T64tohQ78lomG9TwaTlgkC0/buGsQlJh1WikATwuNm1s+xoqYAGa8CxW+dNbhJbC4HM2eJK/8CNnK0pqQLutb5zg90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949325; 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=Rdh6dJZuBOSeGIlWVJNp+3oDaNIoT0LNdsCvpSdzWBg=; b=LydWL1Ssvsl4sF3IWi9Xh1fcu5GGOB2SA9OnLMq5yvL1X9dsmTWU74TspNJgQS5/qKiPeIqqX+EMturwTjgPT34xS/4oPZufMbHm++B5EAAgELORrWNV2jY1ehWhqlCcwkCzc/lCYAQ7/xSJyVeBDe6D0BoRYQe+oZ0yDKDuv+s= 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 169294932538662.546133458523286; Fri, 25 Aug 2023 00:42:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-569-Ff9bigHFMyqmkvGQrVLQIg-1; Fri, 25 Aug 2023 03:40:50 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5842280FEE5; Fri, 25 Aug 2023 07:40:42 +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 C56D01120AC7; Fri, 25 Aug 2023 07:40:42 +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 5E10B1946A63; Fri, 25 Aug 2023 07:40:42 +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 D58F019465BB for ; Fri, 25 Aug 2023 07:40:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AC6F62026D33; Fri, 25 Aug 2023 07:40:39 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5300A2026D68 for ; Fri, 25 Aug 2023 07:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949324; 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=Rdh6dJZuBOSeGIlWVJNp+3oDaNIoT0LNdsCvpSdzWBg=; b=Pi5o0iYSH7ckrVaXxyVEzmHyLR/uJtK+BoyJ4eeSj+2HMaUIMEtFxbRlFEBtRBmJFh8+Jm JWPDxk12XOmZCY7Oj/oVqDM09n2PwUyIjKzYzAtVhG1VYLB9VikzYYFW3HhsA83utSVIt5 RZkcVwOSTv+3dVI84OFJkjKurK36g20= X-MC-Unique: Ff9bigHFMyqmkvGQrVLQIg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 22/27] vbox: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:19 +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.3 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: 1692949327180100001 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/vbox/vbox_snapshot_conf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 6dbd18d657..84f7aceac2 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -736,8 +736,7 @@ virVBoxSnapshotConfAddSnapshotToXmlMachine(virVBoxSnaps= hotConfSnapshot *snapshot if (snapshotParentName =3D=3D NULL) { if (machine->snapshot !=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to add this snapshot, there is alread= y a snapshot " - "linked to the machine")); + _("Unable to add this snapshot, there is alread= y a snapshot linked to the machine")); return -1; } machine->snapshot =3D snapshot; @@ -840,8 +839,7 @@ virVBoxSnapshotConfRemoveSnapshot(virVBoxSnapshotConfMa= chine *machine, } if (snapshot->nchildren > 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("This snapshot has children, " - "please delete these snapshots before")); + _("This snapshot has children, please delete these = snapshots before")); return -1; } =20 --=20 2.41.0