From nobody Sun Nov 24 09:53:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1722605309162109.29914971538233; Fri, 2 Aug 2024 06:28:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1A4CD1467; Fri, 2 Aug 2024 09:28:27 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6B8FC1508; Fri, 2 Aug 2024 09:24:18 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8FE091425; Fri, 2 Aug 2024 09:24:09 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9D0711470 for ; Fri, 2 Aug 2024 09:23:59 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-173-36YCBys9O0iYY2ufB35Q0Q-1; Fri, 02 Aug 2024 09:23:58 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3C44A1955D5A for ; Fri, 2 Aug 2024 13:23:57 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4D62D1955D44 for ; Fri, 2 Aug 2024 13:23:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722605039; h=from:from: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; bh=tNP13mRpeaCraqCIeQ4u2FWwF1zmn37Tkz8/SWtc3lk=; b=Sf4dRL4q/KNFm+KczKKv1vCpcF8c+IwfOclXa9jpmWrVOxwT8RAHFj63p53HX3CC08TS/V kGn5jJ2vYIn+QTw6lYZ4nBjo+jtmd6kvC5yx26U2rVXfoP4fH4KC4jGS8NmmQ7CHYzyCTs QEiFqQ+ZSt1atYg0gOp5ZhzjE0vBx94= X-MC-Unique: 36YCBys9O0iYY2ufB35Q0Q-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH v5 07/11] virParseOwnershipIds: Refactor Date: Fri, 2 Aug 2024 15:23:40 +0200 Message-ID: <0114b71499b4e03353c3b79674dd9fe7d512ebe6.1722604627.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W3DDBUAST7FVFMHXA7MY7ZOH74ARV7WQ X-Message-ID-Hash: W3DDBUAST7FVFMHXA7MY7ZOH74ARV7WQ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1722605310542116600 Content-Type: text/plain; charset="utf-8" Use automatic clearing for temporary variable, remove 'cleanup' label and declare parameters according to new coding style rules. Signed-off-by: Peter Krempa --- src/util/virutil.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index dc5009f11d..56682d7be9 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1367,25 +1367,24 @@ virValidateWWN(const char *wwn) * Returns -1 on error, 0 otherwise. */ int -virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr) +virParseOwnershipIds(const char *label, + uid_t *uidPtr, + gid_t *gidPtr) { - int rc =3D -1; uid_t theuid; gid_t thegid; - char *tmp_label =3D NULL; + g_autofree char *tmp_label =3D g_strdup(label); char *sep =3D NULL; char *owner =3D NULL; char *group =3D NULL; - tmp_label =3D g_strdup(label); - /* Split label */ sep =3D strchr(tmp_label, ':'); if (sep =3D=3D NULL) { virReportError(VIR_ERR_INVALID_ARG, _("Failed to parse uid and gid from '%1$s'"), label); - goto cleanup; + return -1; } *sep =3D '\0'; owner =3D tmp_label; @@ -1396,19 +1395,14 @@ virParseOwnershipIds(const char *label, uid_t *uidP= tr, gid_t *gidPtr) */ if (virGetUserID(owner, &theuid) < 0 || virGetGroupID(group, &thegid) < 0) - goto cleanup; + return -1; if (uidPtr) *uidPtr =3D theuid; if (gidPtr) *gidPtr =3D thegid; - rc =3D 0; - - cleanup: - VIR_FREE(tmp_label); - - return rc; + return 0; } static time_t selfLastChanged; --=20 2.45.2