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 168242dbd5c0aa496b0173af17e30e6bf226bc77..ee94e4f82bac97ae294a46109815fb49a45eb51c 100644 (file)
--- 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 897bffbb384174f27cd9f5c2fa2f79ae493acf02..278f52daa7ca4f97b5c0012b5007d13cd2dd7157 100644 (file)
--- 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 94cab81542202c35938b7cea52599f028f0ac5eb..0c73dab36b43176870c0ee6873ee807af705130a 100644 (file)
--- 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 0aff001951b698d76aa75c3a528915bf9091bbb9..611b5e4cf26789c4e742afd1716a9ed7ef3f256b 100644 (file)
--- 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,