From nobody Tue Feb 10 02:48:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490710083266609.722838573365; Tue, 28 Mar 2017 07:08:03 -0700 (PDT) Received: from localhost ([::1]:53525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csrmz-0000hM-Rl for importer@patchew.org; Tue, 28 Mar 2017 10:08:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csrlE-0007gW-2F for qemu-devel@nongnu.org; Tue, 28 Mar 2017 10:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csrlD-00081h-5m for qemu-devel@nongnu.org; Tue, 28 Mar 2017 10:06:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54776) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csrl8-0007zQ-GW; Tue, 28 Mar 2017 10:06:06 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8B14B41A3A; Tue, 28 Mar 2017 14:06:05 +0000 (UTC) Received: from localhost (ovpn-117-90.phx2.redhat.com [10.3.117.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B67CA81C24; Tue, 28 Mar 2017 14:06:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8B14B41A3A Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jcody@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8B14B41A3A From: Jeff Cody To: qemu-block@nongnu.org Date: Tue, 28 Mar 2017 10:05:49 -0400 Message-Id: <20170328140555.3001-5-jcody@redhat.com> In-Reply-To: <20170328140555.3001-1-jcody@redhat.com> References: <20170328140555.3001-1-jcody@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 28 Mar 2017 14:06:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL for-2.9 04/10] rbd: Clean up after the previous commit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jcody@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster This code in qemu_rbd_parse_filename() found_str =3D qemu_rbd_next_tok(p, '\0', &p); p =3D found_str; has no effect. Drop it, and simplify qemu_rbd_next_tok(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Max Reitz Reviewed-by: Jeff Cody Message-id: 1490691368-32099-5-git-send-email-armbru@redhat.com Signed-off-by: Jeff Cody --- block/rbd.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 0fea348..182a5a3 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -104,19 +104,17 @@ static char *qemu_rbd_next_tok(char *src, char delim,= char **p) =20 *p =3D NULL; =20 - if (delim !=3D '\0') { - for (end =3D src; *end; ++end) { - if (*end =3D=3D delim) { - break; - } - if (*end =3D=3D '\\' && end[1] !=3D '\0') { - end++; - } - } + for (end =3D src; *end; ++end) { if (*end =3D=3D delim) { - *p =3D end + 1; - *end =3D '\0'; + break; } + if (*end =3D=3D '\\' && end[1] !=3D '\0') { + end++; + } + } + if (*end =3D=3D delim) { + *p =3D end + 1; + *end =3D '\0'; } return src; } @@ -177,10 +175,6 @@ static void qemu_rbd_parse_filename(const char *filena= me, QDict *options, goto done; } =20 - found_str =3D qemu_rbd_next_tok(p, '\0', &p); - - p =3D found_str; - /* The following are essentially all key/value pairs, and we treat * 'id' and 'conf' a bit special. Key/value pairs may be in any order= . */ while (p) { --=20 2.9.3