From: Marco Bettini Date: Thu, 25 Jul 2024 15:40:41 +0000 (+0000) Subject: lib: array - Make array_bsearch() const X-Git-Tag: 2.4.1~797 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65ab12223cfd27583b8824babdaad116cbb617ff;p=thirdparty%2Fdovecot%2Fcore.git lib: array - Make array_bsearch() const --- diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c index 4cd4ddab24..2ef89d55b0 100644 --- a/src/imap/imap-client.c +++ b/src/imap/imap-client.c @@ -1254,7 +1254,7 @@ client_command_failed_early(struct client_command_context **_cmd, static bool client_command_input(struct client_command_context *cmd) { struct client *client = cmd->client; - struct command *command; + const struct command *command; const char *tag, *name; int ret; diff --git a/src/imap/imap-commands.c b/src/imap/imap-commands.c index cdf41b2ec3..2dd05e2477 100644 --- a/src/imap/imap-commands.c +++ b/src/imap/imap-commands.c @@ -218,7 +218,7 @@ static int command_bsearch(const char *name, const struct command *cmd) return strcasecmp(name, cmd->name); } -struct command *command_find(const char *name) +const struct command *command_find(const char *name) { if (commands_unsorted) { array_sort(&imap_commands, command_cmp); diff --git a/src/imap/imap-commands.h b/src/imap/imap-commands.h index 6c1c94d4fd..b305ed0fdb 100644 --- a/src/imap/imap-commands.h +++ b/src/imap/imap-commands.h @@ -62,7 +62,7 @@ void command_stats_start(struct client_command_context *cmd); needed during command_exec(). */ void command_stats_flush(struct client_command_context *cmd); -struct command *command_find(const char *name); +const struct command *command_find(const char *name); void commands_init(void); void commands_deinit(void); diff --git a/src/imap/imap-state.c b/src/imap/imap-state.c index 13b6190a65..fa795b1b75 100644 --- a/src/imap/imap-state.c +++ b/src/imap/imap-state.c @@ -785,7 +785,7 @@ void imap_state_import_idle_cmd_tag(struct client *client, const char *tag) if (client->state_import_idle_continue) { /* IDLE command continues */ struct client_command_context *cmd; - struct command *command; + const struct command *command; cmd = client_command_alloc(client); cmd->tag = p_strdup(cmd->pool, tag); diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c index 9f2e1e6485..6020787a06 100644 --- a/src/lib-smtp/smtp-server-command.c +++ b/src/lib-smtp/smtp-server-command.c @@ -74,7 +74,7 @@ smtp_server_command_bsearch(const char *name, return strcasecmp(name, cmd->name); } -static struct smtp_server_command_reg * +static const struct smtp_server_command_reg * smtp_server_command_find(struct smtp_server *server, const char *name) { if (server->commands_unsorted) { diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c index 8e1cd3aa38..e7ef1d9df5 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c +++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c @@ -338,7 +338,7 @@ static void rebuild_apply_map(struct mdbox_storage_rebuild_context *ctx) { struct mdbox_map *map = ctx->storage->map; const struct mail_index_header *hdr; - struct mdbox_rebuild_msg **pos; + struct mdbox_rebuild_msg *const *pos; struct mdbox_rebuild_msg search_msg, *search_msgp = &search_msg; struct dbox_mail_lookup_rec rec; uint32_t seq; @@ -389,7 +389,7 @@ rebuild_lookup_map_uid(struct mdbox_storage_rebuild_context *ctx, uint32_t map_uid) { struct mdbox_rebuild_msg search_msg, *search_msgp = &search_msg; - struct mdbox_rebuild_msg **pos; + struct mdbox_rebuild_msg *const *pos; search_msg.map_uid = map_uid; pos = array_bsearch(&ctx->msgs, &search_msgp, diff --git a/src/lib/array.c b/src/lib/array.c index 44b91a504a..6950248e31 100644 --- a/src/lib/array.c +++ b/src/lib/array.c @@ -139,8 +139,8 @@ void array_sort_i(struct array *array, int (*cmp)(const void *, const void *)) count, array->element_size, cmp); } -void *array_bsearch_i(struct array *array, const void *key, - int (*cmp)(const void *, const void *)) +const void *array_bsearch_i(const struct array *array, const void *key, + int (*cmp)(const void *, const void *)) { unsigned int count; diff --git a/src/lib/array.h b/src/lib/array.h index 9debb37645..55bd88bbdb 100644 --- a/src/lib/array.h +++ b/src/lib/array.h @@ -410,8 +410,8 @@ void array_sort_i(struct array *array, int (*cmp)(const void *, const void *)); &(array)->arr, (const void *)key, \ (int (*)(const void *, const void *))cmp)) -void *array_bsearch_i(struct array *array, const void *key, - int (*cmp)(const void *, const void *)); +const void *array_bsearch_i(const struct array *array, const void *key, + int (*cmp)(const void *, const void *)); static inline void *array_bsearch_modifiable_i(struct array *array, const void *key, int (*cmp)(const void *, const void *)) { @@ -419,7 +419,7 @@ static inline void *array_bsearch_modifiable_i(struct array *array, const void * } #define array_bsearch(array, key, cmp) \ - ARRAY_TYPE_CAST_MODIFIABLE(array) \ + ARRAY_TYPE_CAST_CONST(array) \ ARRAY_SEARCH_CALL(bsearch, array, key, cmp) #define array_bsearch_modifiable(array, key, cmp) \ ARRAY_TYPE_CAST_MODIFIABLE(array) \ diff --git a/src/plugins/pop3-migration/pop3-migration-plugin.c b/src/plugins/pop3-migration/pop3-migration-plugin.c index eea1aeac24..ee0abc36e3 100644 --- a/src/plugins/pop3-migration/pop3-migration-plugin.c +++ b/src/plugins/pop3-migration/pop3-migration-plugin.c @@ -916,7 +916,8 @@ pop3_migration_get_special(struct mail *_mail, enum mail_fetch_field field, struct mail_private *mail = (struct mail_private *)_mail; union mail_module_context *mmail = POP3_MIGRATION_MAIL_CONTEXT(mail); struct pop3_migration_mailbox *mbox = POP3_MIGRATION_CONTEXT_REQUIRE(_mail->box); - struct imap_msg_map map_key, *map; + const struct imap_msg_map *map; + struct imap_msg_map map_key; if (field == MAIL_FETCH_UIDL_BACKEND || field == MAIL_FETCH_POP3_ORDER) { diff --git a/src/plugins/virtual/virtual-sync.c b/src/plugins/virtual/virtual-sync.c index ed07a75b1a..4d7ca984a4 100644 --- a/src/plugins/virtual/virtual-sync.c +++ b/src/plugins/virtual/virtual-sync.c @@ -761,7 +761,7 @@ virtual_sync_mailbox_box_update_flags(struct virtual_sync_context *ctx, const ARRAY_TYPE(seq_range) *uids_arr) { unsigned int i, uid, vseq; - struct virtual_backend_uidmap *vuid; + const struct virtual_backend_uidmap *vuid; struct seq_range_iter iter; i = 0;