From nobody Fri Dec 19 14:28:08 2025 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=1639509005; cv=none; d=zohomail.com; s=zohoarc; b=X40WVhv+yKTjASynv83q42LGO54gqRR5vGSEsMjynkafdNFuDmV90iiN6iGbWniHQ1yMWIcDzt02Fu8t5pxKLGW/bCyXu/BcIAs9kgvqAH0h3r95OMG9mc0T5WOajUxTgQe0ynQsF7+rRXm0HeHD6nQxPAdcc+Zf/JNFHzg5D0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509005; 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=14OOwLzEPW65sXiREgU/XPRrTy5GJA0ordDckyKGyaA=; b=Kw8W94x+7rgBM7Gg8PhBxoV74eThqjnMxDcDRICRQgcPvnyRQpswtGS/JzDbodGIG720J1oHkWKeSwgyQmNIfXCN7LnY6/kOn1lungMo7Lcy/Bphtn93GNQS/isS+0IxpsBCQ586AH5TcaIRIBbRN+cQcqrlOZwpeqJh4AAG4QY= 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 1639509005286900.6019691434905; Tue, 14 Dec 2021 11:10:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-333-86xAF94mMPeunvyXp9NjDA-1; Tue, 14 Dec 2021 14:10:01 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32B553E741; Tue, 14 Dec 2021 19:09:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A7105DF3A; Tue, 14 Dec 2021 19:09:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E04E14BB7C; Tue, 14 Dec 2021 19:09:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BEJ9qQm000788 for ; Tue, 14 Dec 2021 14:09:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id A0B0A18A4E; Tue, 14 Dec 2021 19:09:52 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27C65610A7 for ; Tue, 14 Dec 2021 19:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509004; 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=14OOwLzEPW65sXiREgU/XPRrTy5GJA0ordDckyKGyaA=; b=bYzr40betPK8pausNOuOLGsDSXbjS1Q+hN8GXIow2UUEUYze18juzO5A0lSlCY0zz+yoxd ksySGDectzANCldGAcKWfkwoTxShyj+AQMCZxzJLi8gAYLH0dx3VaP9x2GkDWUy9IRri+w mVjWqjmaQMd79v4WQ8YFIkcMICZ5jro= X-MC-Unique: 86xAF94mMPeunvyXp9NjDA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 01/17] util: dnsmasqCapsSetFromBuffer: use error label Date: Tue, 14 Dec 2021 20:09:17 +0100 Message-Id: <40f8c0009cfea59eb5f5495d1a2f2104d3664247.1639508754.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509006375100001 Rename 'fail' to 'error' to match the prevalent usage. Signed-off-by: J=C3=A1n Tomko --- src/util/virdnsmasq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index b62e353ceb..90a1ea35b6 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -620,12 +620,12 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const cha= r *buf) =20 p =3D STRSKIP(buf, DNSMASQ_VERSION_STR); if (!p) - goto fail; + goto error; =20 virSkipToDigit(&p); =20 if (virParseVersionString(p, &caps->version, true) < 0) - goto fail; + goto error; =20 if (strstr(buf, "--bind-dynamic")) dnsmasqCapsSet(caps, DNSMASQ_CAPS_BIND_DYNAMIC); @@ -650,7 +650,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char = *buf) dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM) ? "" : "NOT "); return 0; =20 - fail: + error: p =3D strchr(buf, '\n'); if (!p) len =3D strlen(buf); --=20 2.31.1