From nobody Tue Dec 16 08:37:31 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 152784122850797.75550331561192; Fri, 1 Jun 2018 01:20:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D857630CAE30; Fri, 1 Jun 2018 08:20:26 +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 A88E530012B7; Fri, 1 Jun 2018 08:20:26 +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 5AFE74CA8A; Fri, 1 Jun 2018 08:20:26 +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 w518KFd9028633 for ; Fri, 1 Jun 2018 04:20:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9224C2166BB6; Fri, 1 Jun 2018 08:20:15 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33A302166BB2 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:54 +0200 Message-Id: <12ac2822523fc1685b810f99260b986368e9f373.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 2/9] tests: qemumonitor: Simplify handling of end of file in full file test 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.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 01 Jun 2018 08:20:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" On EOF, the loop can be terminated right away since most of it is skipped anyways and the handling of the last command is repeated after the loop. Signed-off-by: Peter Krempa --- tests/qemumonitortestutils.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 62f68ee699..a73272e7b0 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1416,9 +1416,12 @@ qemuMonitorTestNewFromFileFull(const char *fileName, tmp =3D jsonstr; command =3D tmp; while ((tmp =3D strchr(tmp, '\n'))) { - bool eof =3D !tmp[1]; line++; + /* eof */ + if (!tmp[1]) + break; + if (*(tmp + 1) !=3D '\n') { *tmp =3D ' '; tmp++; @@ -1434,21 +1437,16 @@ qemuMonitorTestNewFromFileFull(const char *fileName, response =3D NULL; } - if (!eof) { - /* Move the @tmp and @singleReply. */ - tmp +=3D 2; + /* Move the @tmp and @singleReply. */ + tmp +=3D 2; - if (!command) { - commandln =3D line; - command =3D tmp; - } else { - response =3D tmp; - } + if (!command) { + commandln =3D line; + command =3D tmp; + } else { + response =3D tmp; } } - - if (eof) - break; } if (command) { --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list