From nobody Wed May 14 17:10:19 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 1528120999884623.0057662856142; Mon, 4 Jun 2018 07:03:19 -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 A6B65AD146; Mon, 4 Jun 2018 14:03:17 +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 67B7A2010CF0; Mon, 4 Jun 2018 14:03:16 +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 347871800FC2; Mon, 4 Jun 2018 14:03:15 +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 w54Dx1pF002783 for ; Mon, 4 Jun 2018 09:59:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D6257C20; Mon, 4 Jun 2018 13:59:01 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 423BF63F53 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:36 +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 03/10] 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 04 Jun 2018 14:03:18 +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 Reviewed-by: John Ferlan --- 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