From nobody Thu Sep 19 16:39:18 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 1725031110466938.6271128612392; Fri, 30 Aug 2024 08:18:30 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C1E6134F; Fri, 30 Aug 2024 11:18:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A703D1370; Fri, 30 Aug 2024 11:14:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 238911420; Fri, 30 Aug 2024 11:14:18 -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 28D3114F1 for ; Fri, 30 Aug 2024 11:14:02 -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-561-ttY-r03NObqVP8Sy_V6v9g-1; Fri, 30 Aug 2024 11:14:00 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 3325D19560A2 for ; Fri, 30 Aug 2024 15:13:59 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.110]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3FE7619560AA for ; Fri, 30 Aug 2024 15:13:57 +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.6 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,T_SCC_BODY_TEXT_LINE 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=1725030841; 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=siBOQxa5frBfq8j7Kr/UlKukii8IrJvHwBFoQXcrN80=; b=OWb7YbSc6Smzdyqa/dBogfBGWCv5m6BWrrdSzvUo4N8PY8RjddHFjNTV1jnQKOv1AUBQwQ aX3iPtyHRd0vYKHoLVZ6l0Z9noH1PqJDeRnA3ciMldB/CfCqKVVgwLCJTXOj8TX/9AajwY h8XFOziICl+/2kGWADSqh6dlz0LxtTA= X-MC-Unique: ttY-r03NObqVP8Sy_V6v9g-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH v6 07/13] virParseOwnershipIds: Refactor Date: Fri, 30 Aug 2024 17:13:39 +0200 Message-ID: <20240830151345.717568-8-abologna@redhat.com> In-Reply-To: <20240830151345.717568-1-abologna@redhat.com> References: <20240830151345.717568-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HLYTD64SPP4FTHX5HP3NFRCDOKN6HPPU X-Message-ID-Hash: HLYTD64SPP4FTHX5HP3NFRCDOKN6HPPU X-MailFrom: abologna@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: 1725031111595116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Peter Krempa Use automatic clearing for temporary variable, remove 'cleanup' label and declare parameters according to new coding style rules. Signed-off-by: Peter Krempa Reviewed-by: Andrea Bolognani Signed-off-by: Andrea Bolognani --- 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; =20 - 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; =20 if (uidPtr) *uidPtr =3D theuid; if (gidPtr) *gidPtr =3D thegid; =20 - rc =3D 0; - - cleanup: - VIR_FREE(tmp_label); - - return rc; + return 0; } =20 static time_t selfLastChanged; --=20 2.46.0