From nobody Sun Feb 8 19:24:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 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=1595979821; cv=none; d=zohomail.com; s=zohoarc; b=QEGc5N8T3fh3jlNOUdxm3eG+Lw/cic+09RELfgcDwyPVPo1zX8iQefQ61KeT8lbhMOCwoIv8HyGKTsVDmaSTKFzyRkOllymGaLEWmf2Zd4KZN8wkbtjg7C0AkxpVs8yqK7CSX/XyvsfdhJj2jewBPENmnC5eiyVCdygmnZuGD20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595979821; 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=KcTzRgRpAHOEZm5PTGuwnouO/cF0Tirq5bdbVYxsQGw=; b=J4bqdU/H+BvJ4wTq+V3Le8Lp78KS/8S+CdwrN3zdKl1ogSfJFvgYiQWQodk4Y9rObmCDsHSHJJfxWv8SMd13FTLZfAdrCrq1SQjO4FKhl/7gCho0pEb9ukHbN2xS/ApagMh+uAJXhDwZR57LldljseW3czEqFnZ4k2n94q7xZvs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1595979820995389.89998990791264; Tue, 28 Jul 2020 16:43:40 -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-200-f7ruYO4fMpW0-otK4Ub1XA-1; Tue, 28 Jul 2020 19:43:36 -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 077AD19067E0; Tue, 28 Jul 2020 23:43:31 +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 D97EE712F9; Tue, 28 Jul 2020 23:43:30 +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 859CA1809554; Tue, 28 Jul 2020 23:43:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06SNhRCh004272 for ; Tue, 28 Jul 2020 19:43:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC4191001B2C; Tue, 28 Jul 2020 23:43:27 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2C4C10013C4 for ; Tue, 28 Jul 2020 23:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595979819; 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=KcTzRgRpAHOEZm5PTGuwnouO/cF0Tirq5bdbVYxsQGw=; b=EwP1v7TQRNTFM8olmbk0OJmh+t+JoAJnMY/ysxrsDQao7+ie1JHY/DR/yk+QCkHTdTFNy/ 4I/rQ7PDoIRGXnpb2FGELQE4WiLr7if/L0dIw1biUNHLhBa3tKgD4AKueEZG1U6j9oeBVQ e9v006s2cH/dTgQ1arEW+ukX4e20T7M= X-MC-Unique: f7ruYO4fMpW0-otK4Ub1XA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] tests: qemu: reduce scope of some variables Date: Wed, 29 Jul 2020 01:43:16 +0200 Message-Id: <87aec4d6169438889588719b95d9dbd842d46611.1595979782.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 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) Reduce the scope of some variables and mark them as g_autofree. Signed-off-by: J=C3=A1n Tomko --- tests/qemumonitortestutils.c | 6 ++---- tests/testutilsqemu.c | 4 +--- tests/utiltest.c | 15 ++------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 180ac15a15..c7396e4361 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -787,7 +787,6 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTestPt= r test, virJSONValuePtr val =3D NULL; virJSONValuePtr args; virJSONValuePtr argobj; - char *argstr =3D NULL; const char *cmdname; size_t i; int ret =3D -1; @@ -815,6 +814,8 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTestPt= r test, /* validate the args */ for (i =3D 0; i < data->nargs; i++) { qemuMonitorTestCommandArgsPtr arg =3D &data->args[i]; + g_autofree char *argstr =3D NULL; + if (!(argobj =3D virJSONValueObjectGet(args, arg->argname))) { qemuMonitorTestError("Missing argument '%s' for command '%s'", arg->argname, @@ -835,15 +836,12 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTest= Ptr test, arg->argval, argstr); goto cleanup; } - - VIR_FREE(argstr); } =20 /* arguments checked out, return the response */ ret =3D qemuMonitorTestAddResponse(test, data->response); =20 cleanup: - VIR_FREE(argstr); virJSONValueFree(val); return ret; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e3b1e2813b..855e51460b 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -497,7 +497,6 @@ testQemuGetLatestCapsForArch(const char *arch, DIR *dir =3D NULL; int rc; char *fullsuffix =3D NULL; - char *tmp =3D NULL; unsigned long maxver =3D 0; unsigned long ver; g_autofree char *maxname =3D NULL; @@ -509,7 +508,7 @@ testQemuGetLatestCapsForArch(const char *arch, goto cleanup; =20 while ((rc =3D virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) { - VIR_FREE(tmp); + g_autofree char *tmp =3D NULL; =20 tmp =3D g_strdup(STRSKIP(ent->d_name, "caps_")); =20 @@ -543,7 +542,6 @@ testQemuGetLatestCapsForArch(const char *arch, ret =3D g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname); =20 cleanup: - VIR_FREE(tmp); VIR_FREE(fullsuffix); virDirClose(&dir); return ret; diff --git a/tests/utiltest.c b/tests/utiltest.c index 2bff7859dc..2921ae8d8c 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -42,23 +42,18 @@ static int testIndexToDiskName(const void *data G_GNUC_UNUSED) { size_t i; - char *diskName =3D NULL; =20 for (i =3D 0; i < G_N_ELEMENTS(diskNames); ++i) { - VIR_FREE(diskName); + g_autofree char *diskName =3D NULL; =20 diskName =3D virIndexToDiskName(i, "sd"); =20 if (STRNEQ(diskNames[i], diskName)) { virTestDifference(stderr, diskNames[i], diskName); - VIR_FREE(diskName); - return -1; } } =20 - VIR_FREE(diskName); - return 0; } =20 @@ -69,10 +64,9 @@ testDiskNameToIndex(const void *data G_GNUC_UNUSED) { size_t i; int idx; - char *diskName =3D NULL; =20 for (i =3D 0; i < 100000; ++i) { - VIR_FREE(diskName); + g_autofree char *diskName =3D NULL; =20 diskName =3D virIndexToDiskName(i, "sd"); idx =3D virDiskNameToIndex(diskName); @@ -80,15 +74,10 @@ testDiskNameToIndex(const void *data G_GNUC_UNUSED) if (idx < 0 || idx !=3D i) { VIR_TEST_DEBUG("\nExpect [%zu]", i); VIR_TEST_DEBUG("Actual [%d]", idx); - - VIR_FREE(diskName); - return -1; } } =20 - VIR_FREE(diskName); - return 0; } =20 --=20 2.26.2