From nobody Thu May 15 07:22:20 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528120882835928.9338344751445; Mon, 4 Jun 2018 07:01:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B5C2166399; Mon, 4 Jun 2018 14:01:20 +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 402959BA52; Mon, 4 Jun 2018 14:01:19 +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 3FA161808872; Mon, 4 Jun 2018 14:01:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w54Dx2OY002801 for ; Mon, 4 Jun 2018 09:59:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E37B7C20; Mon, 4 Jun 2018 13:59:02 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7BE363F53 for ; Mon, 4 Jun 2018 13:59:01 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 4 Jun 2018 15:58:37 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/10] tests: qemumonitor: Optimize control flow when concatenating replies 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 04 Jun 2018 14:01:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The test file can be broken up by newlines and is automatically concatenated back. Fix the control flow so that the concatenation code 'continues' the loop rather than branching out. Also add an anotation to the concatenation code. Signed-off-by: Peter Krempa Reviewed-by: John Ferlan --- tests/qemumonitortestutils.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index a73272e7b0..98c6ce6187 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1422,30 +1422,32 @@ qemuMonitorTestNewFromFileFull(const char *fileName, if (!tmp[1]) break; + /* concatenate block which was broken up for readability */ if (*(tmp + 1) !=3D '\n') { *tmp =3D ' '; tmp++; - } else { - /* Cut off a single reply. */ - *(tmp + 1) =3D '\0'; + continue; + } - if (response) { - if (qemuMonitorTestFullAddItem(ret, fileName, command, - response, commandln) < 0) - goto error; - command =3D NULL; - response =3D NULL; - } + /* Cut off a single reply. */ + *(tmp + 1) =3D '\0'; - /* Move the @tmp and @singleReply. */ - tmp +=3D 2; + if (response) { + if (qemuMonitorTestFullAddItem(ret, fileName, command, + response, commandln) < 0) + goto error; + command =3D NULL; + response =3D NULL; + } - if (!command) { - commandln =3D line; - command =3D tmp; - } else { - response =3D tmp; - } + /* Move the @tmp and @singleReply. */ + tmp +=3D 2; + + if (!command) { + commandln =3D line; + command =3D tmp; + } else { + response =3D tmp; } } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list