From nobody Tue Dec 16 06:17:22 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 1527841233178563.6760240374891; Fri, 1 Jun 2018 01:20:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B9E17A1DD6; Fri, 1 Jun 2018 08:20: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 87B872010CE0; Fri, 1 Jun 2018 08:20:31 +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 2E70F180BA82; Fri, 1 Jun 2018 08:20:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w518KGxb028640 for ; Fri, 1 Jun 2018 04:20:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 352472166BB6; Fri, 1 Jun 2018 08:20:16 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD9312166BB2 for ; Fri, 1 Jun 2018 08:20:15 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 10:19:55 +0200 Message-Id: <9db51a7daf387fc7b4cdf8421643cc4e4e281e93.1527841021.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [RFC PATCH 3/9] 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 01 Jun 2018 08:20:32 +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 --- tests/qemumonitortestutils.c | 42 ++++++++++++++++++++++------------------= -- 1 file changed, 22 insertions(+), 20 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++; + continue; + } + + /* Cut off a single reply. */ + *(tmp + 1) =3D '\0'; + + if (response) { + if (qemuMonitorTestFullAddItem(ret, fileName, command, + response, commandln) < 0) + goto error; + command =3D NULL; + response =3D NULL; + } + + /* Move the @tmp and @singleReply. */ + tmp +=3D 2; + + if (!command) { + commandln =3D line; + command =3D tmp; } else { - /* Cut off a single reply. */ - *(tmp + 1) =3D '\0'; - - if (response) { - if (qemuMonitorTestFullAddItem(ret, fileName, command, - response, commandln) < 0) - goto error; - command =3D NULL; - response =3D NULL; - } - - /* Move the @tmp and @singleReply. */ - tmp +=3D 2; - - if (!command) { - commandln =3D line; - command =3D tmp; - } else { - response =3D tmp; - } + response =3D tmp; } } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list