From nobody Sun May 5 08:14:55 2024 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 1551953696841271.7941372927137; Thu, 7 Mar 2019 02:14:56 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D8D373004149; Thu, 7 Mar 2019 10:14:54 +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 493495D719; Thu, 7 Mar 2019 10:14:54 +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 0308B41F3D; Thu, 7 Mar 2019 10:14:54 +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 x27AEqa1017094 for ; Thu, 7 Mar 2019 05:14:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9DE072CFAA; Thu, 7 Mar 2019 10:14:52 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22C33608EC for ; Thu, 7 Mar 2019 10:14:51 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:14:40 +0100 Message-Id: <20190307101446.25765-2-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 1/7] util: Make virStringHasCaseSuffix() return bool 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 07 Mar 2019 10:14:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" It's a predicate, so bool is the appropriate return type. Signed-off-by: Andrea Bolognani --- src/util/virstring.c | 4 ++-- src/util/virstring.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index cf3d9c6f03..cd781a84f9 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1248,7 +1248,7 @@ virStringHasSuffix(const char *str, return STREQ(str + len - suffixlen, suffix); } =20 -int +bool virStringHasCaseSuffix(const char *str, const char *suffix) { @@ -1256,7 +1256,7 @@ virStringHasCaseSuffix(const char *str, int suffixlen =3D strlen(suffix); =20 if (len < suffixlen) - return 0; + return false; =20 return STRCASEEQ(str + len - suffixlen, suffix); } diff --git a/src/util/virstring.h b/src/util/virstring.h index 5b127cdba4..ed2db8a3dc 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -290,8 +290,8 @@ char *virStringReplace(const char *haystack, =20 bool virStringHasSuffix(const char *str, const char *suffix); -int virStringHasCaseSuffix(const char *str, - const char *suffix); +bool virStringHasCaseSuffix(const char *str, + const char *suffix); int virStringStripSuffix(char *str, const char *suffix) ATTRIBUTE_RETURN_CHECK; int virStringMatchesNameSuffix(const char *file, --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 08:14:55 2024 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 1551953702790115.0836909754563; Thu, 7 Mar 2019 02:15:02 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8FB23092650; Thu, 7 Mar 2019 10:15:00 +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 7BE03413B; Thu, 7 Mar 2019 10:15:00 +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 396CD181A13B; Thu, 7 Mar 2019 10:15:00 +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 x27AEuXE017109 for ; Thu, 7 Mar 2019 05:14:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id 060DE608EC; Thu, 7 Mar 2019 10:14:56 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7EC3860C1B for ; Thu, 7 Mar 2019 10:14:52 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:14:41 +0100 Message-Id: <20190307101446.25765-3-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 2/7] util: Make virStringStripSuffix() return bool 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 07 Mar 2019 10:15:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" While this function is not, strictly speaking, a predicate, it still mostly behaves like one as evidenced by the vast majority of its callers, so using bool rather than int as the return type makes sense. Signed-off-by: Andrea Bolognani --- src/util/virstring.c | 8 ++++---- src/util/virstring.h | 4 ++-- tests/testutilsqemu.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index cd781a84f9..e479d3194c 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1261,7 +1261,7 @@ virStringHasCaseSuffix(const char *str, return STRCASEEQ(str + len - suffixlen, suffix); } =20 -int +bool virStringStripSuffix(char *str, const char *suffix) { @@ -1269,14 +1269,14 @@ virStringStripSuffix(char *str, int suffixlen =3D strlen(suffix); =20 if (len < suffixlen) - return 0; + return false; =20 if (STRNEQ(str + len - suffixlen, suffix)) - return 0; + return false; =20 str[len - suffixlen] =3D '\0'; =20 - return 1; + return true; } =20 int diff --git a/src/util/virstring.h b/src/util/virstring.h index ed2db8a3dc..f5f1ecbe1e 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -292,8 +292,8 @@ bool virStringHasSuffix(const char *str, const char *suffix); bool virStringHasCaseSuffix(const char *str, const char *suffix); -int virStringStripSuffix(char *str, - const char *suffix) ATTRIBUTE_RETURN_CHECK; +bool virStringStripSuffix(char *str, + const char *suffix) ATTRIBUTE_RETURN_CHECK; int virStringMatchesNameSuffix(const char *file, const char *name, const char *suffix); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 61bf67d5ad..03a3f86c62 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -834,7 +834,7 @@ testQemuGetLatestCapsForArch(const char *dirname, if (rc =3D=3D 0) continue; =20 - if (virStringStripSuffix(tmp, fullsuffix) !=3D 1) + if (!virStringStripSuffix(tmp, fullsuffix)) continue; =20 if (virParseVersionString(tmp, &ver, false) < 0) { --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 08:14:55 2024 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 1551953702636371.3441825699375; Thu, 7 Mar 2019 02:15:02 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B42A9C0587C3; Thu, 7 Mar 2019 10:15:00 +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 858D85D788; Thu, 7 Mar 2019 10:15:00 +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 38685244F3; Thu, 7 Mar 2019 10:15:00 +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 x27AEuPA017114 for ; Thu, 7 Mar 2019 05:14:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id D22596090C; Thu, 7 Mar 2019 10:14:56 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 559EA608EC for ; Thu, 7 Mar 2019 10:14:56 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:14:42 +0100 Message-Id: <20190307101446.25765-4-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 3/7] util: Make virStringMatchesNameSuffix() return bool 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Mar 2019 10:15:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" It's a predicate, so bool is the appropriate return type. Signed-off-by: Andrea Bolognani --- src/util/virstring.c | 6 +++--- src/util/virstring.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index e479d3194c..f669d59f58 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1279,7 +1279,7 @@ virStringStripSuffix(char *str, return true; } =20 -int +bool virStringMatchesNameSuffix(const char *file, const char *name, const char *suffix) @@ -1291,9 +1291,9 @@ virStringMatchesNameSuffix(const char *file, if (filelen =3D=3D (namelen + suffixlen) && STREQLEN(file, name, namelen) && STREQLEN(file + namelen, suffix, suffixlen)) - return 1; + return true; else - return 0; + return false; } =20 /** diff --git a/src/util/virstring.h b/src/util/virstring.h index f5f1ecbe1e..1e36ac459c 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -294,9 +294,9 @@ bool virStringHasCaseSuffix(const char *str, const char *suffix); bool virStringStripSuffix(char *str, const char *suffix) ATTRIBUTE_RETURN_CHECK; -int virStringMatchesNameSuffix(const char *file, - const char *name, - const char *suffix); +bool virStringMatchesNameSuffix(const char *file, + const char *name, + const char *suffix); =20 void virStringStripIPv6Brackets(char *str); bool virStringHasChars(const char *str, --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 08:14:55 2024 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 155195370204012.989732072186143; Thu, 7 Mar 2019 02:15:02 -0800 (PST) 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 7C6C03082141; Thu, 7 Mar 2019 10:15:00 +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 52703608EC; Thu, 7 Mar 2019 10:15:00 +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 0C7CB181A138; Thu, 7 Mar 2019 10:15:00 +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 x27AEvjL017123 for ; Thu, 7 Mar 2019 05:14:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id A91DE608EC; Thu, 7 Mar 2019 10:14:57 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2DC00611BC for ; Thu, 7 Mar 2019 10:14:57 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:14:43 +0100 Message-Id: <20190307101446.25765-5-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 4/7] util: Tweak virStringHasSuffix() 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 07 Mar 2019 10:15:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Make it more similar to virStringStripSuffix(), which also results in types being more correct since STRNEQ() returns int rather than bool. Signed-off-by: Andrea Bolognani --- src/util/virstring.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index f669d59f58..a938669b63 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1245,7 +1245,10 @@ virStringHasSuffix(const char *str, if (len < suffixlen) return false; =20 - return STREQ(str + len - suffixlen, suffix); + if (STRNEQ(str + len - suffixlen, suffix)) + return false; + + return true; } =20 bool --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 08:14:55 2024 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 15519537089751016.4004951499044; Thu, 7 Mar 2019 02:15:08 -0800 (PST) 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 573C2307D779; 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 1C4782CFB6; 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 A9FCD3FB15; 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 x27AEwxX017130 for ; Thu, 7 Mar 2019 05:14:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 81AD2608EC; Thu, 7 Mar 2019 10:14:58 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05EE26090C for ; Thu, 7 Mar 2019 10:14:57 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:14:44 +0100 Message-Id: <20190307101446.25765-6-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 5/7] util: Tweak virStringHasCaseSuffix() 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 07 Mar 2019 10:15:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Make it more similar to virStringStripSuffix(), which also results in types being more correct since STRCASEEQ() returns int rather than bool. Signed-off-by: Andrea Bolognani --- src/util/virstring.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index a938669b63..e47d76accd 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1261,7 +1261,10 @@ virStringHasCaseSuffix(const char *str, if (len < suffixlen) return false; =20 - return STRCASEEQ(str + len - suffixlen, suffix); + if (STRCASENEQ(str + len - suffixlen, suffix)) + return false; + + return true; } =20 bool --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 08:14:55 2024 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 From nobody Sun May 5 08:14:55 2024 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 1551953712611837.7533339643081; Thu, 7 Mar 2019 02:15:12 -0800 (PST) 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 E8772307E070; Thu, 7 Mar 2019 10:15:10 +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 B5496611C0; Thu, 7 Mar 2019 10:15:10 +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 5C6D13FAF4; Thu, 7 Mar 2019 10:15:10 +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 x27AF00r017143 for ; Thu, 7 Mar 2019 05:15:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 31DBA60C1B; Thu, 7 Mar 2019 10:15:00 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A9E00608EC for ; Thu, 7 Mar 2019 10:14:59 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:14:46 +0100 Message-Id: <20190307101446.25765-8-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 7/7] util: Tweak virStringMatchesNameSuffix() some more 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 07 Mar 2019 10:15:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We can use STRNEQ() instead of STRNEQLEN() since we're only interested in the trailing part of the string. Signed-off-by: Andrea Bolognani --- src/util/virstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index ba36562f85..f23daca0bd 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1300,7 +1300,7 @@ virStringMatchesNameSuffix(const char *file, if (STRNEQLEN(file, name, namelen)) return false; =20 - if (STRNEQLEN(file + namelen, suffix, suffixlen)) + if (STRNEQ(file + namelen, suffix)) return false; =20 return true; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list