From nobody Sun Feb 8 22:00:34 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=1623752862; cv=none; d=zohomail.com; s=zohoarc; b=WIrPJweIpOoTdyNQpz/7g3YtqEfFrgO/pJjaJveqg9Me7HnzZN4Z7QMhHsLofPSX0Oj3H3tfkyujga0gezH0Z8sSOAPBFIecr1Zv2L62ANtyKMwcrf0AWoekf2DQWpTTuRyKLPWFheDU1LCU5dB0zZEcS51DXZDlZW+LSr8Q0jE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623752862; 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=iwFIlfVFiOVu0Ppu+BbqixF1ccTyc+8E7l+mZ2r2hGA=; b=ES2rAkbyDzb3gIZPP8CHOj4BCScV5che+62xefhXd2X+c7Ys5kOWg0j2MZvZ8Y2RnDiXmxidnfzIekGb7Cbgp4FlcR4jOIutsqMDiId3dsLuxZoEeohFfVVEflvSWrv4NalK323VSsGt67clBKUD3x/sZOuXY0WfTxYi3E+VdBE= 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 1623752862014945.1877193487717; Tue, 15 Jun 2021 03:27:42 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-548-es55ZNtPMUqKx5-Wk4norg-1; Tue, 15 Jun 2021 06:27:39 -0400 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 BFB92A40C3; Tue, 15 Jun 2021 10:27:34 +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 A2E8B60BD9; Tue, 15 Jun 2021 10:27:34 +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 56D0646F58; Tue, 15 Jun 2021 10:27:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15FARWiV019613 for ; Tue, 15 Jun 2021 06:27:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 740B5189BB; Tue, 15 Jun 2021 10:27:32 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id D72E118F0A for ; Tue, 15 Jun 2021 10:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623752860; 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=iwFIlfVFiOVu0Ppu+BbqixF1ccTyc+8E7l+mZ2r2hGA=; b=b8MraBjcjl3FyzVHPv5fEBGYusx9SQUFmX/4C8w5ZoxXl+g9Mw+3WkrKOhGlq1O4UOBZeu omaGg7/GIG0LDZIe0UKIf0AF8CPiZP9ggcC+LzbGTOS5d62TLSZrdSktZ64ARiGV8dXlE3 tOnuTixFMpZ+NcTC7bVUYNBKtk7JS1M= X-MC-Unique: es55ZNtPMUqKx5-Wk4norg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/13] qemuMonitorJSONParsePropsList: Refactor cleanup Date: Tue, 15 Jun 2021 12:27:14 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use 'g_auto' for @proplist and remove @ret. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 46aa3330a8..3e7a61c52c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6615,14 +6615,13 @@ qemuMonitorJSONParsePropsList(virJSONValue *cmd, char ***props) { virJSONValue *data; - char **proplist =3D NULL; + g_auto(GStrv) proplist =3D NULL; size_t n =3D 0; size_t count =3D 0; size_t i; - int ret =3D -1; if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) - goto cleanup; + return -1; data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); @@ -6641,18 +6640,14 @@ qemuMonitorJSONParsePropsList(virJSONValue *cmd, if (!(tmp =3D virJSONValueObjectGetString(child, "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("reply data was missing 'name'")); - goto cleanup; + return -1; } proplist[count++] =3D g_strdup(tmp); } - ret =3D count; *props =3D g_steal_pointer(&proplist); - - cleanup: - g_strfreev(proplist); - return ret; + return count; } --=20 2.31.1