From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 26 Jul 2024 07:49:17 +0000 (+0000)
Subject: lib: sort - Rename bsearch_(case)strcmp() into search_(case)strcmp()
X-Git-Tag: 2.4.1~800
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=369a2c064c0410e64d1635744474059ab64517b5;p=thirdparty%2Fdovecot%2Fcore.git

lib: sort - Rename bsearch_(case)strcmp() into search_(case)strcmp()
---

diff --git a/src/lib-mail/istream-header-filter.c b/src/lib-mail/istream-header-filter.c
index 168242dbd5..ee94e4f82b 100644
--- a/src/lib-mail/istream-header-filter.c
+++ b/src/lib-mail/istream-header-filter.c
@@ -264,7 +264,7 @@ static ssize_t read_header(struct header_filter_istream *mstream)
 			matched = i_bsearch(hdr->name, mstream->headers,
 					    mstream->headers_count,
 					    sizeof(*mstream->headers),
-					    bsearch_strcasecmp) != NULL;
+					    search_strcasecmp) != NULL;
 		}
 		if (mstream->callback == NULL) {
 			/* nothing gets excluded */
diff --git a/src/lib/sort.c b/src/lib/sort.c
index 897bffbb38..278f52daa7 100644
--- a/src/lib/sort.c
+++ b/src/lib/sort.c
@@ -6,12 +6,12 @@
 #include <string.h>
 #include <strings.h>
 
-int bsearch_strcmp(const char *key, const char *const *member)
+int search_strcmp(const char *key, const char *const *member)
 {
 	return strcmp(key, *member);
 }
 
-int bsearch_strcasecmp(const char *key, const char *const *member)
+int search_strcasecmp(const char *key, const char *const *member)
 {
 	return strcasecmp(key, *member);
 }
diff --git a/src/lib/sort.h b/src/lib/sort.h
index 94cab81542..0c73dab36b 100644
--- a/src/lib/sort.h
+++ b/src/lib/sort.h
@@ -27,7 +27,7 @@ INTEGER_CMP(uint32_cmp, uint32_t)
 						typeof(const typeof(*base) *))), \
 		(int (*)(const void *, const void *))cmp)
 
-int bsearch_strcmp(const char *key, const char *const *member) ATTR_PURE;
-int bsearch_strcasecmp(const char *key, const char *const *member) ATTR_PURE;
+int search_strcmp(const char *key, const char *const *member) ATTR_PURE;
+int search_strcasecmp(const char *key, const char *const *member) ATTR_PURE;
 
 #endif
diff --git a/src/plugins/acl/acl-backend.c b/src/plugins/acl/acl-backend.c
index 0aff001951..611b5e4cf2 100644
--- a/src/plugins/acl/acl-backend.c
+++ b/src/plugins/acl/acl-backend.c
@@ -158,7 +158,7 @@ bool acl_backend_user_is_in_group(struct acl_backend *backend,
 	unsigned int group_count;
 	const char *const *groups = array_get(&backend->set->acl_groups, &group_count);
 	return i_bsearch(group_name, groups, group_count,
-			 sizeof(const char *), bsearch_strcmp) != NULL;
+			 sizeof(const char *), search_strcmp) != NULL;
 }
 
 bool acl_backend_rights_match_me(struct acl_backend *backend,