From nobody Sun Feb 8 19:39:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1639421054; cv=none; d=zohomail.com; s=zohoarc; b=g1OVXbj+yIfrkbBFDsHdt6KF6T1QdvZVlirZaYqe4U013RYgYlCRz9Hu69bZHPMkKqabZZeLGICCBPGMTjehULv9F64kjg5Qfx0bGuw8Y+xg/PYzhRQzaRj/J4lHjWMdoNwTieqbthByL3t4fkAHhexYiJIWc6V0yP7IQDt72fw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639421054; 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=vmgUxuW1SY0VF+/LD+OBo93DUesVF8FC5RE2E9BQwMI=; b=KgqfIJDjJk+RT30c8ydXzt5ufPcBJrtCvDmnQ7a/V4UkuuOwaCqnIZzy+vo+VkViayGU0AEGNC0RFNzXRaq3VrnYUDXr/C1QMRYp2ns+qXGuONRGlWCTAZc/fN48PSyM/+WAyQT0zbXPtzTN8RgfuqlvIAN6vzDxAfSeLi8Jbf4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1639421054813248.14263217845848; Mon, 13 Dec 2021 10:44:14 -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-140-CQvII0QeP6mnjAelXilkHg-1; Mon, 13 Dec 2021 13:44:12 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 969F3102CB3F; Mon, 13 Dec 2021 18:44:07 +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 7C36845D9A; Mon, 13 Dec 2021 18:44:07 +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 040024A713; Mon, 13 Dec 2021 18:44:07 +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 1BDIhTDQ003968 for ; Mon, 13 Dec 2021 13:43:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id CEA064066; Mon, 13 Dec 2021 18:43:29 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5596E60C9F for ; Mon, 13 Dec 2021 18:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639421053; 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=vmgUxuW1SY0VF+/LD+OBo93DUesVF8FC5RE2E9BQwMI=; b=Osy9y/qDoKeR1DxoQeRNSjlKdCiiQz5eWa16oslSZRm586j3bFz0N3DmVjqKzNMZ6BhY3q T55x7neEWQjtlriHS0Y3GdOSYVM8qOZv+6/5WGU4eYYD2JzihrcSexxybmY1Ui8QLFKMbV EnZkZReY8Do0PuG4XUzRt6pZzldawsc= X-MC-Unique: CQvII0QeP6mnjAelXilkHg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 18/20] vmware: refactor vmwareExtractVersion Date: Mon, 13 Dec 2021 19:43:10 +0100 Message-Id: <00a83de8d55ca7ae2ca3c359943c92a4de6e7ca2.1639420923.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.11 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: 1639421056332100001 Use g_auto for cleanup and remove the cleanup label. Signed-off-by: J=C3=A1n Tomko --- src/vmware/vmware_conf.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 17e67ea6d2..c88f11fcab 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -242,11 +242,10 @@ vmwareParseVersionStr(int type, const char *verbuf, u= nsigned long *version) int vmwareExtractVersion(struct vmware_driver *driver) { - int ret =3D -1; - virCommand *cmd =3D NULL; - char * outbuf =3D NULL; - char *bin =3D NULL; - char *vmwarePath =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; + g_autofree char *outbuf =3D NULL; + g_autofree char *bin =3D NULL; + g_autofree char *vmwarePath =3D NULL; =20 vmwarePath =3D g_path_get_dirname(driver->vmrun); =20 @@ -266,7 +265,7 @@ vmwareExtractVersion(struct vmware_driver *driver) default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("invalid driver type for version detection")); - goto cleanup; + return -1; } =20 cmd =3D virCommandNewArgList(bin, "-v", NULL); @@ -274,19 +273,12 @@ vmwareExtractVersion(struct vmware_driver *driver) virCommandSetErrorBuffer(cmd, &outbuf); =20 if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; =20 if (vmwareParseVersionStr(driver->type, outbuf, &driver->version) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - virCommandFree(cmd); - VIR_FREE(outbuf); - VIR_FREE(bin); - VIR_FREE(vmwarePath); - return ret; + return 0; } =20 int --=20 2.31.1