From nobody Mon Feb 9 08:55:11 2026 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 1551953708021105.32291498949428; Thu, 7 Mar 2019 02:15:08 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3BD07883C2; Thu, 7 Mar 2019 10:15:06 +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 01F3D60142; Thu, 7 Mar 2019 10:15:06 +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 9F51F3FB14; Thu, 7 Mar 2019 10:15:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27AExZr017135 for ; Thu, 7 Mar 2019 05:14:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 598AB6090C; Thu, 7 Mar 2019 10:14:59 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2692608EC for ; Thu, 7 Mar 2019 10:14:58 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:14:45 +0100 Message-Id: <20190307101446.25765-7-abologna@redhat.com> In-Reply-To: <20190307101446.25765-1-abologna@redhat.com> References: <20190307101446.25765-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/7] util: Tweak virStringMatchesNameSuffix() 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 07 Mar 2019 10:15:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Make it more similar to virStringStripSuffix(). Signed-off-by: Andrea Bolognani --- src/util/virstring.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index e47d76accd..ba36562f85 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1294,12 +1294,16 @@ virStringMatchesNameSuffix(const char *file, int namelen =3D strlen(name); int suffixlen =3D strlen(suffix); =20 - if (filelen =3D=3D (namelen + suffixlen) && - STREQLEN(file, name, namelen) && - STREQLEN(file + namelen, suffix, suffixlen)) - return true; - else + if (filelen !=3D (namelen + suffixlen)) + return false; + + if (STRNEQLEN(file, name, namelen)) return false; + + if (STRNEQLEN(file + namelen, suffix, suffixlen)) + return false; + + return true; } =20 /** --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list