From nobody Sun Feb 8 21:28:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1559909063; cv=none; d=zoho.com; s=zohoarc; b=jv4T7ByqTqkMy3zAqy39N0P5x0t54AxoOtOzT4tVQ4i4f9bB+zngjsalBlEcXC8eZzU1Okp9OMBiVkuyr5tjfthvR26ZNZqiGeWXiXHnIDbVP+GtPxCifKIqtzNOQnjYaXWOooPbDQ8rMisV4Wpq0VpgjcPEqpULaEifLhbpehA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559909063; 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:ARC-Authentication-Results; bh=gFQ8AjynozuCL6gWa80ngqLujVzdRXwTRYlyjQFSLHs=; b=CcfrmLO2gbI5jfgaBirS2He5jtDqziJLM2MHB8xd98HOC3sp5fGn5BGL9FusvGXqHLJThRSJaHSq6TPWJznPdgQr2AEgJWmQtloTOU01lu0b7P59NqjH+Iq+PfSKNfwbFVLWMGRumAaqj1mUbxAZ4JMlybBynllHT0U6d7Kh/FY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1559909063872241.77123621254634; Fri, 7 Jun 2019 05:04:23 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 775BEC058CBD; Fri, 7 Jun 2019 12:04:12 +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 1C2E17D506; Fri, 7 Jun 2019 12:04:09 +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 497F024AFA; Fri, 7 Jun 2019 12:03:59 +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 x57C1LGd014762 for ; Fri, 7 Jun 2019 08:01:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id E86D77DFD2; Fri, 7 Jun 2019 12:01:21 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 739C418394 for ; Fri, 7 Jun 2019 12:01:21 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 7 Jun 2019 14:01:16 +0200 Message-Id: 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 Subject: [libvirt] [PATCH 1/4] tests: Refactor cleanup in qemuMonitorTestProcessCommandVerbatim 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: , Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 07 Jun 2019 12:04:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use VIR_AUTOFREE and get rid of the cleanup section. Signed-off-by: Peter Krempa --- tests/qemumonitortestutils.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 4a108c382d..1cd35830af 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -688,8 +688,8 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPt= r test, const char *cmdstr) { struct qemuMonitorTestHandlerData *data =3D item->opaque; - char *reformatted =3D NULL; - char *errmsg =3D NULL; + VIR_AUTOFREE(char *) reformatted =3D NULL; + VIR_AUTOFREE(char *) errmsg =3D NULL; int ret =3D -1; /* JSON strings will be reformatted to simplify checking */ @@ -705,7 +705,7 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPt= r test, } else { if (data->cmderr) { if (virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr) < 0) - goto cleanup; + return -1; ret =3D qemuMonitorTestAddErrorResponse(test, errmsg); } else { @@ -715,9 +715,6 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPt= r test, } } - cleanup: - VIR_FREE(errmsg); - VIR_FREE(reformatted); return ret; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list