From nobody Mon Feb 9 10:32:30 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=1633622469; cv=none; d=zohomail.com; s=zohoarc; b=oC+Evh0vV3f6OtI3tyJEqVJiJGygyRo8q3cQwHeOR6Zigh5aNm9mVEpv7GuCRd9V66WqQIAgGQc8OH8guyDlEOQXPTGy1F2XB13AbSEUANcGYpu5eidS2mw5LL/9WLWbm6RB0IJ5valOMlqNyQTqoXhGbTK4BeMLTyrsKmIpiWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633622469; 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=BifHoOLC2Nk1ZAYbctqNxWlAHqIJjBPffz/Dyy9PPxs=; b=ZqamUYdciEuAUcFwD3M+lpYmhGahHNbg9asYNHRIYNgB2SSQXYJr/TtLGuXlTVtJpZpzN2dEYaNUkOJ3t/hVvF3iUBNjgFQXgcf48FMCV7Y1fjivmMUvzERZSMiPST8ei+3/rPyRmgNG3FKx/sD68pkonNpxfgJi+ZvnsHwnQ8Q= 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 1633622469141198.88594329813725; Thu, 7 Oct 2021 09:01:09 -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-470-hSK5Fm8oOT6j-EREPVXjig-1; Thu, 07 Oct 2021 12:01:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 804B838A5A9; Thu, 7 Oct 2021 15:44:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AA3B105C81A; Thu, 7 Oct 2021 15:43: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 CF8531800B8B; Thu, 7 Oct 2021 15:43:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FJ2vt023773 for ; Thu, 7 Oct 2021 11:19:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id B2B355D740; Thu, 7 Oct 2021 15:19:02 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 206DA5F4F1 for ; Thu, 7 Oct 2021 15:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633622468; 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=BifHoOLC2Nk1ZAYbctqNxWlAHqIJjBPffz/Dyy9PPxs=; b=BhjLywNCQnU/bIbGfuo1aIjbNw0qj5hJ2iTd2Fj2OmP3pI3PcSZg6F/6CFO4I5wlBh12oO KSkwV6EoiTm4WgiN1Yd3UAQSsWTZc0+ZcCSr09kW9tVaqn5sf5g1s8xGO8/AszHcj97ul8 BJhCwTn/exBMoMBe9sro1O7yQ63rrLU= X-MC-Unique: hSK5Fm8oOT6j-EREPVXjig-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 027/103] virQEMUBuildCommandLineJSONIterate: Simplify logic Date: Thu, 7 Oct 2021 17:17:15 +0200 Message-Id: <502921f2f93cffe7f23e6f58f9534652dbd430e7.1633619630.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.22 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) X-ZM-MESSAGEID: 1633622474984100001 Content-Type: text/plain; charset="utf-8" With automatic memory freeing we can simplify the function to avoid two almost-identical calls to virQEMUBuildCommandLineJSONRecurse. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virqemu.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index e31451dff4..3e9311e3c7 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -158,23 +158,17 @@ virQEMUBuildCommandLineJSONIterate(const char *key, void *opaque) { struct virQEMUCommandLineJSONIteratorData *data =3D opaque; + g_autofree char *tmpkey =3D NULL; if (STREQ_NULLABLE(key, data->skipKey)) return 0; - if (data->prefix) { - g_autofree char *tmpkey =3D NULL; + if (data->prefix) + key =3D tmpkey =3D g_strdup_printf("%s.%s", data->prefix, key); - tmpkey =3D g_strdup_printf("%s.%s", data->prefix, key); - - return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf, - data->skipKey, - data->arrayFunc, false); - } else { - return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf, - data->skipKey, - data->arrayFunc, false); - } + return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf, + data->skipKey, + data->arrayFunc, false); } --=20 2.31.1