From: Aki Tuomi Date: Fri, 11 Jan 2019 10:40:59 +0000 (+0200) Subject: global: Use array_push_back instead of array_append X-Git-Tag: 2.3.6~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bdf68a378dedabd04c8cce29f8afd04ceac7ea0;p=thirdparty%2Fdovecot%2Fcore.git global: Use array_push_back instead of array_append --- diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c index 852efb297c..d5cf75049f 100755 --- a/src/auth/auth-policy.c +++ b/src/auth/auth-policy.c @@ -192,7 +192,7 @@ void auth_policy_init(void) pair.key = key; pair.value = *ptr; key = NULL; - array_append(&attribute_pairs, &pair, 1); + array_push_back(&attribute_pairs, &pair); } } if (key != NULL) { diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c index 5a75f4413f..5c2eeee5fc 100644 --- a/src/auth/db-ldap.c +++ b/src/auth/db-ldap.c @@ -632,7 +632,7 @@ ldap_request_send_subquery(struct ldap_connection *conn, t_array_init(&var_funcs_table, 8); for(ptr = auth_request_var_funcs_table; ptr->key != NULL; ptr++) { - array_append(&var_funcs_table, ptr, 1); + array_push_back(&var_funcs_table, ptr); } ftable = array_append_space(&var_funcs_table); ftable->key = "ldap"; @@ -664,7 +664,7 @@ ldap_request_send_subquery(struct ldap_connection *conn, strcmp(p+1, named_res->field->name) == 0) { name = p_strdup_until(unsafe_data_stack_pool, field->ldap_attr_name, p); - array_append(&ctx.attr_names, &name, 1); + array_push_back(&ctx.attr_names, &name); } } } @@ -1462,7 +1462,7 @@ void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist, if (*ldap_attr != '\0' && strchr(ldap_attr, '@') == NULL) { /* root request's attribute */ - array_append(&ctx.attr_names, &ldap_attr, 1); + array_push_back(&ctx.attr_names, &ldap_attr); } } } diff --git a/src/auth/password-scheme.c b/src/auth/password-scheme.c index 0b84c125b1..6287116cf9 100644 --- a/src/auth/password-scheme.c +++ b/src/auth/password-scheme.c @@ -857,7 +857,7 @@ void password_schemes_get(ARRAY_TYPE(password_scheme_p) *schemes_r) const struct password_scheme *scheme; ctx = hash_table_iterate_init(password_schemes); while(hash_table_iterate(ctx, password_schemes, &key, &scheme)) { - array_append(schemes_r, &scheme, 1); + array_push_back(schemes_r, &scheme); } hash_table_iterate_deinit(&ctx); } diff --git a/src/config/config-connection.c b/src/config/config-connection.c index 2d11b49d63..c3c7b7864e 100644 --- a/src/config/config-connection.c +++ b/src/config/config-connection.c @@ -84,7 +84,7 @@ static int config_connection_request(struct config_connection *conn, module = *args + 7; if (strcmp(module, "master") == 0) is_master = TRUE; - array_append(&modules, &module, 1); + array_push_back(&modules, &module); } else if (str_begins(*args, "lname=")) filter.local_name = *args + 6; else if (str_begins(*args, "lip=")) { diff --git a/src/config/config-filter.c b/src/config/config-filter.c index 2908da0262..0c248ec8f4 100644 --- a/src/config/config-filter.c +++ b/src/config/config-filter.c @@ -226,7 +226,8 @@ config_filter_find_all(struct config_filter_context *ctx, pool_t pool, if (!config_filter_match_service(mask, filter)) { if (!str_array_contains(&service_names, mask->service) && have_changed_settings(ctx->parsers[i], modules)) - array_append(&service_names, &mask->service, 1); + array_push_back(&service_names, + &mask->service); continue; } @@ -239,7 +240,7 @@ config_filter_find_all(struct config_filter_context *ctx, pool_t pool, output_r->used_local = TRUE; if (mask->remote_bits > 0) output_r->used_remote = TRUE; - array_append(&matches, &ctx->parsers[i], 1); + array_push_back(&matches, &ctx->parsers[i]); } } if (filter->service == NULL) { @@ -260,7 +261,7 @@ config_filter_get_all(struct config_filter_context *ctx) t_array_init(&filters, 8); for (i = 0; ctx->parsers[i] != NULL; i++) { - array_append(&filters, &ctx->parsers[i], 1); + array_push_back(&filters, &ctx->parsers[i]); } array_sort(&filters, config_filter_parser_cmp_rev); array_append_zero(&filters); @@ -293,7 +294,7 @@ config_filter_find_subset(struct config_filter_context *ctx, tmp_mask.remote_bits = 0; if (config_filter_match_rest(&tmp_mask, filter)) - array_append(&matches, &ctx->parsers[i], 1); + array_push_back(&matches, &ctx->parsers[i]); } array_sort(&matches, config_filter_parser_cmp_rev); array_append_zero(&matches); diff --git a/src/config/config-parser.c b/src/config/config-parser.c index 42310dc4ff..92c2328676 100644 --- a/src/config/config-parser.c +++ b/src/config/config-parser.c @@ -1087,7 +1087,7 @@ void config_parse_load_modules(void) t_strdup_printf("%s_set_roots", m->name)); if (roots != NULL) { for (i = 0; roots[i] != NULL; i++) - array_append(&new_roots, &roots[i], 1); + array_push_back(&new_roots, &roots[i]); } services = module_get_symbol_quiet(m, @@ -1099,14 +1099,14 @@ void config_parse_load_modules(void) service_set = module_get_symbol_quiet(m, t_strdup_printf("%s_service_settings", m->name)); if (service_set != NULL) - array_append(&new_services, &service_set, 1); + array_push_back(&new_services, &service_set); } } if (array_count(&new_roots) > 0) { /* modules added new settings. add the defaults and start using the new list. */ for (i = 0; all_roots[i] != NULL; i++) - array_append(&new_roots, &all_roots[i], 1); + array_push_back(&new_roots, &all_roots[i]); array_append_zero(&new_roots); all_roots = array_first(&new_roots); roots_free_at_deinit = new_roots; @@ -1117,7 +1117,7 @@ void config_parse_load_modules(void) /* module added new services. update the defaults. */ services = array_get(default_services, &count); for (i = 0; i < count; i++) - array_append(&new_services, &services[i], 1); + array_push_back(&new_services, &services[i]); *default_services = new_services; services_free_at_deinit = new_services; } else { diff --git a/src/config/doveconf.c b/src/config/doveconf.c index 10896cabfe..93421ae58d 100644 --- a/src/config/doveconf.c +++ b/src/config/doveconf.c @@ -354,14 +354,14 @@ config_dump_human_output(struct config_dump_human_context *ctx, /* "strlist=" */ str = p_strdup_printf(ctx->pool, "%s/", t_strcut(strings[i]+1, '=')); - array_append(&prefixes_arr, &str, 1); + array_push_back(&prefixes_arr, &str); } else { /* string is in format: "list=0 1 2" */ for (args = t_strsplit(p + 1, " "); *args != NULL; args++) { str = p_strdup_printf(ctx->pool, "%s/%s/", t_strcut(strings[i]+1, '='), *args); - array_append(&prefixes_arr, &str, 1); + array_push_back(&prefixes_arr, &str); } } } T_END; @@ -421,7 +421,7 @@ config_dump_human_output(struct config_dump_human_context *ctx, str_len(ctx->list_prefix); prefix_idx = j; prefix.prefix_idx = prefix_idx; - array_append(&prefix_stack, &prefix, 1); + array_push_back(&prefix_stack, &prefix); str_append_max(ctx->list_prefix, indent_str, indent*2); p = strchr(key2, '/'); @@ -912,7 +912,7 @@ int main(int argc, char *argv[]) break; case 'm': module = t_strdup(optarg); - array_append(&module_names, &module, 1); + array_push_back(&module_names, &module); break; case 'n': scope = CONFIG_DUMP_SCOPE_CHANGED; diff --git a/src/director/director-test.c b/src/director/director-test.c index 31295a0ade..0a3235dc77 100644 --- a/src/director/director-test.c +++ b/src/director/director-test.c @@ -501,7 +501,7 @@ static void admin_read_hosts(struct admin_connection *conn) str_to_uint(args[1], &host->vhost_count) < 0) i_fatal("host list broken"); hash_table_insert(hosts, &host->ip, host); - array_append(&hosts_array, &host, 1); + array_push_back(&hosts_array, &host); } T_END; } if (line == NULL) diff --git a/src/director/main.c b/src/director/main.c index eff0a12418..8adea3f95d 100644 --- a/src/director/main.c +++ b/src/director/main.c @@ -245,7 +245,7 @@ static void director_state_changed(struct director *dir) if (!ret) { /* a) request for a user being killed b) user is weak */ - array_append(&new_requests, requestp, 1); + array_push_back(&new_requests, requestp); } } array_clear(&dir->pending_requests); diff --git a/src/director/user-directory.c b/src/director/user-directory.c index 7e8edfb441..0c5ae239d2 100644 --- a/src/director/user-directory.c +++ b/src/director/user-directory.c @@ -223,7 +223,7 @@ void user_directory_sort(struct user_directory *dir) i_array_init(&users, users_count); user = dir->head; for (i = 0; i < users_count; i++, user = user->next) - array_append(&users, &user, 1); + array_push_back(&users, &user); i_assert(user == NULL); array_sort(&users, user_timestamp_cmp); diff --git a/src/dns/dns-client.c b/src/dns/dns-client.c index 3716b04249..0373353c6f 100644 --- a/src/dns/dns-client.c +++ b/src/dns/dns-client.c @@ -67,7 +67,7 @@ static int dns_client_input_args(struct connection *client, const char *const *a o_stream_nsend_str(client->output, "0\t"); for (i = 0; i < ips_count; i++) { const char *ip = net_ip2addr(&ips[i]); - array_append(&tmp, &ip, 1); + array_push_back(&tmp, &ip); } array_append_zero(&tmp); e_debug(e->event(), "Resolve success: %s", diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c index eb377d1312..1351979a32 100644 --- a/src/doveadm/doveadm-cmd.c +++ b/src/doveadm/doveadm-cmd.c @@ -354,7 +354,7 @@ doveadm_cmd_params_to_argv(const char *name, int pargc, const struct doveadm_cmd int i; const char * const * cptr; i_assert(array_count(argv) == 0); - array_append(argv, &name, 1); + array_push_back(argv, &name); ARRAY_TYPE(const_string) pargv; t_array_init(&pargv, 8); @@ -373,24 +373,25 @@ doveadm_cmd_params_to_argv(const char *name, int pargc, const struct doveadm_cmd array_add_opt = TRUE; } else { optarg = t_strdup_printf("-%c", params[i].short_opt); - array_append(argv, &optarg, 1); + array_push_back(argv, &optarg); } } /* CMD_PARAM_BOOL is implicitly handled above */ if (params[i].type == CMD_PARAM_STR) { - array_append(target, ¶ms[i].value.v_string,1); + array_push_back(target, + ¶ms[i].value.v_string); } else if (params[i].type == CMD_PARAM_INT64) { const char *tmp = t_strdup_printf("%lld", (long long)params[i].value.v_int64); - array_append(target, &tmp, 1); + array_push_back(target, &tmp); } else if (params[i].type == CMD_PARAM_IP) { const char *tmp = net_ip2addr(¶ms[i].value.v_ip); - array_append(target, &tmp, 1); + array_push_back(target, &tmp); } else if (params[i].type == CMD_PARAM_ARRAY) { array_foreach(¶ms[i].value.v_array, cptr) { if (array_add_opt) - array_append(argv, &optarg, 1); - array_append(target, cptr, 1); + array_push_back(argv, &optarg); + array_push_back(target, cptr); } } } @@ -398,7 +399,7 @@ doveadm_cmd_params_to_argv(const char *name, int pargc, const struct doveadm_cmd if (array_count(&pargv) > 0) { const char *dashdash = "--"; - array_append(argv, &dashdash, 1); + array_push_back(argv, &dashdash); array_append_array(argv, &pargv); } array_append_zero(argv); @@ -438,7 +439,7 @@ doveadm_build_options(const struct doveadm_cmd_param par[], } if (par[i].type != CMD_PARAM_BOOL) longopt.has_arg = 1; - array_append(longopts, &longopt, 1); + array_push_back(longopts, &longopt); } array_append_zero(longopts); } diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c index 22ea73b5cd..4604160ebc 100644 --- a/src/doveadm/doveadm-dsync.c +++ b/src/doveadm/doveadm-dsync.c @@ -211,7 +211,7 @@ mirror_get_remote_cmd_line(const char *const *argv, t_array_init(&cmd_args, 16); for (i = 0; argv[i] != NULL; i++) { p = argv[i]; - array_append(&cmd_args, &p, 1); + array_push_back(&cmd_args, &p); } if (legacy_dsync) { @@ -221,7 +221,7 @@ mirror_get_remote_cmd_line(const char *const *argv, /* we're executing doveadm */ p = "dsync-server"; } - array_append(&cmd_args, &p, 1); + array_push_back(&cmd_args, &p); array_append_zero(&cmd_args); *cmd_args_r = array_first(&cmd_args); } @@ -270,7 +270,7 @@ get_ssh_cmd_args(const char *host, const char *login, const char *mail_user) continue; value = t_strdup(str_c(str)); } - array_append(&cmd_args, &value, 1); + array_push_back(&cmd_args, &value); } array_append_zero(&cmd_args); return array_first(&cmd_args); diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c index 67ea8a9686..41948d01b5 100644 --- a/src/doveadm/doveadm-fs.c +++ b/src/doveadm/doveadm-fs.c @@ -349,7 +349,7 @@ cmd_fs_delete_dir_recursive(struct fs *fs, unsigned int async_count, we'll include the "/" suffix in the filename when deleting it. */ fname = t_strconcat(fname, "/", NULL); - array_append(&fnames, &fname, 1); + array_push_back(&fnames, &fname); } if (fs_iter_deinit(&iter) < 0) { i_error("fs_iter_deinit(%s) failed: %s", @@ -371,7 +371,7 @@ cmd_fs_delete_dir_recursive(struct fs *fs, unsigned int async_count, iter = fs_iter_init(fs, path_prefix, 0); while ((fname = fs_iter_next(iter)) != NULL) { fname = t_strdup(fname); - array_append(&fnames, &fname, 1); + array_push_back(&fnames, &fname); } if (fs_iter_deinit(&iter) < 0) { i_error("fs_iter_deinit(%s) failed: %s", diff --git a/src/doveadm/doveadm-mail-altmove.c b/src/doveadm/doveadm-mail-altmove.c index 5af39322b8..42b5d6029d 100644 --- a/src/doveadm/doveadm-mail-altmove.c +++ b/src/doveadm/doveadm-mail-altmove.c @@ -76,8 +76,8 @@ cmd_altmove_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user) if (prev_storage != NULL) { if (ns_purge(_ctx, prev_ns, prev_storage) < 0) ret = -1; - array_append(&purged_storages, - &prev_storage, 1); + array_push_back(&purged_storages, + &prev_storage); } prev_storage = ns_storage; prev_ns = info->ns; @@ -91,7 +91,7 @@ cmd_altmove_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user) if (prev_storage != NULL) { if (ns_purge(_ctx, prev_ns, prev_storage) < 0) ret = -1; - array_append(&purged_storages, &prev_storage, 1); + array_push_back(&purged_storages, &prev_storage); } /* make sure all private storages have been purged */ @@ -108,7 +108,7 @@ cmd_altmove_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user) if (i == count) { if (ns_purge(_ctx, ns, ns_storage) < 0) ret = -1; - array_append(&purged_storages, &ns_storage, 1); + array_push_back(&purged_storages, &ns_storage); storages = array_get(&purged_storages, &count); } } diff --git a/src/doveadm/doveadm-mail-batch.c b/src/doveadm/doveadm-mail-batch.c index 681c8864b4..18c9db4cf7 100644 --- a/src/doveadm/doveadm-mail-batch.c +++ b/src/doveadm/doveadm-mail-batch.c @@ -116,7 +116,7 @@ cmd_batch_preinit(struct doveadm_mail_cmd_context *_ctx) p_array_init(&sep_args, _ctx->pool, 16); for (i = start = 0;; i++) { if (args[i] != NULL && strcmp(args[i], sep) != 0) { - array_append(&sep_args, &args[i], 1); + array_push_back(&sep_args, &args[i]); continue; } if (i > start) { diff --git a/src/doveadm/doveadm-mail-flags.c b/src/doveadm/doveadm-mail-flags.c index c4abd1afba..00ff0aef24 100644 --- a/src/doveadm/doveadm-mail-flags.c +++ b/src/doveadm/doveadm-mail-flags.c @@ -103,7 +103,7 @@ static void cmd_flags_init(struct doveadm_mail_cmd_context *_ctx, ctx->flags |= flag; } else { str = p_strdup(_ctx->pool, str); - array_append(&keywords, &str, 1); + array_push_back(&keywords, &str); } } if (array_count(&keywords) > 0 || ctx->modify_type == MODIFY_REPLACE) { diff --git a/src/doveadm/doveadm-mail-mailbox.c b/src/doveadm/doveadm-mail-mailbox.c index e3641ba937..9945d6cf9d 100644 --- a/src/doveadm/doveadm-mail-mailbox.c +++ b/src/doveadm/doveadm-mail-mailbox.c @@ -332,7 +332,7 @@ get_child_mailboxes(struct mail_user *user, ARRAY_TYPE(const_string) *mailboxes, MAILBOX_LIST_ITER_RETURN_NO_FLAGS); while ((info = mailbox_list_iter_next(iter)) != NULL) { child_name = t_strdup(info->vname); - array_append(mailboxes, &child_name, 1); + array_push_back(mailboxes, &child_name); } return mailbox_list_iter_deinit(&iter); } @@ -362,7 +362,7 @@ cmd_mailbox_delete_run(struct doveadm_mail_cmd_context *_ctx, ret = -1; } if ((*namep)[0] != '\0') - array_append(&recursive_mailboxes, namep, 1); + array_push_back(&recursive_mailboxes, namep); } array_sort(&recursive_mailboxes, i_strcmp_reverse_p); mailboxes = &recursive_mailboxes; diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c index 23cb32a46f..554e4eda8c 100644 --- a/src/doveadm/doveadm-mail.c +++ b/src/doveadm/doveadm-mail.c @@ -1030,7 +1030,7 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx) else mctx->iterate_all_users = arg->value.v_bool; fieldstr = "-A"; - array_append(&full_args, &fieldstr, 1); + array_push_back(&full_args, &fieldstr); } else if (strcmp(arg->name, "socket-path") == 0) { doveadm_settings->doveadm_socket_path = arg->value.v_string; if (doveadm_settings->doveadm_worker_count == 0) @@ -1041,8 +1041,8 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx) cctx->username = arg->value.v_string; fieldstr = "-u"; - array_append(&full_args, &fieldstr, 1); - array_append(&full_args, &arg->value.v_string, 1); + array_push_back(&full_args, &fieldstr); + array_push_back(&full_args, &arg->value.v_string); if (strchr(arg->value.v_string, '*') != NULL || strchr(arg->value.v_string, '?') != NULL) { if (tcp_server) @@ -1057,9 +1057,9 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx) wildcard_user = "*"; mctx->users_list_input = arg->value.v_istream; fieldstr = "-F"; - array_append(&full_args, &fieldstr, 1); + array_push_back(&full_args, &fieldstr); fieldstr = ""; /* value doesn't really matter */ - array_append(&full_args, &fieldstr, 1); + array_push_back(&full_args, &fieldstr); i_stream_ref(mctx->users_list_input); } else if (strcmp(arg->name, "field") == 0 || strcmp(arg->name, "flag") == 0) { @@ -1068,7 +1068,7 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx) fieldstr) */ fieldstr = p_array_const_string_join(mctx->pool, &arg->value.v_array, " "); - array_append(&pargv, &fieldstr, 1); + array_push_back(&pargv, &fieldstr); } else if (strcmp(arg->name, "file") == 0) { /* input for doveadm_mail_get_input(), used by e.g. save */ @@ -1111,15 +1111,16 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx) return; } - array_append(&full_args, &short_opt_str, 1); + array_push_back(&full_args, &short_opt_str); if (arg->type == CMD_PARAM_STR) - array_append(&full_args, &arg->value.v_string, 1); + array_push_back(&full_args, + &arg->value.v_string); } else if ((arg->flags & CMD_PARAM_FLAG_POSITIONAL) != 0) { /* feed this into pargv */ if (arg->type == CMD_PARAM_ARRAY) array_append_array(&pargv, &arg->value.v_array); else if (arg->type == CMD_PARAM_STR) - array_append(&pargv, &arg->value.v_string, 1); + array_push_back(&pargv, &arg->value.v_string); } else { doveadm_exit_code = EX_USAGE; i_error("invalid parameter: %s", arg->name); @@ -1129,7 +1130,7 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx) } const char *dashdash = "--"; - array_append(&full_args, &dashdash, 1); + array_push_back(&full_args, &dashdash); array_append_zero(&pargv); /* All the -parameters need to be included in full_args so that diff --git a/src/doveadm/doveadm-mailbox-list-iter.c b/src/doveadm/doveadm-mailbox-list-iter.c index 1255e36664..c713e45bb3 100644 --- a/src/doveadm/doveadm-mailbox-list-iter.c +++ b/src/doveadm/doveadm-mailbox-list-iter.c @@ -54,7 +54,7 @@ search_args_get_mailbox_patterns(const struct mail_search_arg *args, array_clear(patterns); return FALSE; } - array_append(patterns, &args->value.str, 1); + array_push_back(patterns, &args->value.str); break; case SEARCH_MAILBOX_GUID: *have_guid = TRUE; diff --git a/src/doveadm/dsync/dsync-brain-mailbox.c b/src/doveadm/dsync/dsync-brain-mailbox.c index c87bb6a92b..ec885d82c7 100644 --- a/src/doveadm/dsync/dsync-brain-mailbox.c +++ b/src/doveadm/dsync/dsync-brain-mailbox.c @@ -669,7 +669,7 @@ dsync_cache_fields_update(const struct dsync_mailbox *local_box, lf->decision > rf->decision)) { /* use local decision and timestamp */ } else { - array_append(&changes, rf, 1); + array_push_back(&changes, rf); } li++; ri++; } else if (ret < 0) { @@ -681,7 +681,7 @@ dsync_cache_fields_update(const struct dsync_mailbox *local_box, /* field hasn't be used for a long time, remote will probably drop this soon as well */ } else { - array_append(&changes, &remote_fields[ri], 1); + array_push_back(&changes, &remote_fields[ri]); } ri++; } diff --git a/src/doveadm/dsync/dsync-mail.c b/src/doveadm/dsync/dsync-mail.c index 2a009a9577..b82818f75a 100644 --- a/src/doveadm/dsync/dsync-mail.c +++ b/src/doveadm/dsync/dsync-mail.c @@ -128,7 +128,7 @@ const_string_array_dup(pool_t pool, const ARRAY_TYPE(const_string) *src, p_array_init(dest, pool, count); for (i = 0; i < count; i++) { str = p_strdup(pool, strings[i]); - array_append(dest, &str, 1); + array_push_back(dest, &str); } } diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c index 707fcc5563..babb145798 100644 --- a/src/doveadm/dsync/dsync-mailbox-import.c +++ b/src/doveadm/dsync/dsync-mailbox-import.c @@ -1051,7 +1051,7 @@ static void keywords_append(ARRAY_TYPE(const_string) *dest, continue; namep = array_idx(keywords, start_idx+i); - array_append(dest, namep, 1); + array_push_back(dest, namep); } } @@ -1108,7 +1108,7 @@ merge_keywords(struct mail *mail, const ARRAY_TYPE(const_string) *local_changes, for (i = 0; i < count; i++) { name = changes[i]+1; name_idx = array_count(&all_keywords); - array_append(&all_keywords, &name, 1); + array_push_back(&all_keywords, &name); switch (changes[i][0]) { case KEYWORD_CHANGE_ADD: @@ -1138,7 +1138,7 @@ merge_keywords(struct mail *mail, const ARRAY_TYPE(const_string) *local_changes, name = changes[i]+1; if (!keyword_find(&all_keywords, name, &name_idx)) { name_idx = array_count(&all_keywords); - array_append(&all_keywords, &name, 1); + array_push_back(&all_keywords, &name); } switch (changes[i][0]) { @@ -1157,7 +1157,7 @@ merge_keywords(struct mail *mail, const ARRAY_TYPE(const_string) *local_changes, name = local_keywords[i]; if (!keyword_find(&all_keywords, name, &name_idx)) { name_idx = array_count(&all_keywords); - array_append(&all_keywords, &name, 1); + array_push_back(&all_keywords, &name); } local_final[name_idx/32] |= 1U << (name_idx%32); } @@ -1220,7 +1220,7 @@ dsync_mailbox_import_replace_flags(struct mail *mail, case KEYWORD_CHANGE_FINAL: case KEYWORD_CHANGE_ADD_AND_FINAL: name = changes[i]+1; - array_append(&keywords, &name, 1); + array_push_back(&keywords, &name); break; case KEYWORD_CHANGE_REMOVE: break; @@ -2317,7 +2317,7 @@ dsync_mailbox_get_final_keywords(const struct dsync_mail_change *change) changes[i][0] == KEYWORD_CHANGE_ADD_AND_FINAL) { const char *name = changes[i]+1; - array_append(&keywords, &name, 1); + array_push_back(&keywords, &name); } } if (array_count(&keywords) == 0) @@ -2769,7 +2769,7 @@ dsync_mailbox_import_commit(struct dsync_mailbox_importer *importer, bool final) } T_END; seq_range_array_iter_init(&iter, &changes.saved_uids); n = 0; while (seq_range_array_iter_nth(&iter, n++, &uid)) - array_append(&importer->saved_uids, &uid, 1); + array_push_back(&importer->saved_uids, &uid); pool_unref(&changes.pool); /* commit flag changes and expunges */ diff --git a/src/doveadm/dsync/dsync-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-mailbox-tree-sync.c index 2594d1d09e..8bbc2bebe3 100644 --- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c +++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c @@ -237,7 +237,7 @@ sync_tree_sort_and_delete_mailboxes(struct dsync_mailbox_tree_sync_ctx *ctx, } } ctx->combined_mailboxes_count++; - array_append(&siblings, &node, 1); + array_push_back(&siblings, &node); } sort_siblings(&siblings); dsync_mailbox_tree_bfs_iter_deinit(&iter); diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c index 6765f3c3c3..1816ecb536 100644 --- a/src/imap-urlauth/imap-urlauth-worker.c +++ b/src/imap-urlauth/imap-urlauth-worker.c @@ -981,7 +981,7 @@ int main(int argc, char *argv[]) case 'a': { const char *app = t_strdup(optarg); - array_append(&access_apps, &app, 1); + array_push_back(&access_apps, &app); break; } default: diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c index dd61190a23..ebd8fc113d 100644 --- a/src/imap/cmd-list.c +++ b/src/imap/cmd-list.c @@ -288,7 +288,7 @@ list_get_ref_patterns(struct cmd_list_context *ctx, const char *ref, t_array_init(&full_patterns, 16); for (pat = patterns; *pat != NULL; pat++) { pattern = mailbox_list_join_refpattern(ns->list, ref, *pat); - array_append(&full_patterns, &pattern, 1); + array_push_back(&full_patterns, &pattern); } array_append_zero(&full_patterns); /* NULL-terminate */ return array_first(&full_patterns); @@ -398,7 +398,7 @@ bool cmd_list_full(struct client_command_context *cmd, bool lsub) } if (imap_utf7_to_utf8(pattern, str) == 0) pattern = p_strdup(cmd->pool, str_c(str)); - array_append(&patterns, &pattern, 1); + array_push_back(&patterns, &pattern); str_truncate(str, 0); } args += 2; @@ -411,7 +411,7 @@ bool cmd_list_full(struct client_command_context *cmd, bool lsub) pattern = p_strdup(cmd->pool, str_c(str)); p_array_init(&patterns, cmd->pool, 1); - array_append(&patterns, &pattern, 1); + array_push_back(&patterns, &pattern); args += 2; if (lsub) { diff --git a/src/imap/cmd-select.c b/src/imap/cmd-select.c index 1c7153ce75..db7f5ef3ac 100644 --- a/src/imap/cmd-select.c +++ b/src/imap/cmd-select.c @@ -45,9 +45,9 @@ static int select_qresync_get_uids(struct imap_select_context *ctx, for (i = 0; i < uid_count; i++) { if (!seq_range_array_iter_nth(&seq_iter, n++, &seq)) return -1; - array_append(&ctx->qresync_sample_uidset, - &uid_range[i].seq1, 1); - array_append(&ctx->qresync_sample_seqset, &seq, 1); + array_push_back(&ctx->qresync_sample_uidset, + &uid_range[i].seq1); + array_push_back(&ctx->qresync_sample_seqset, &seq); diff = uid_range[i].seq2 - uid_range[i].seq1; if (diff > 0) { @@ -55,9 +55,9 @@ static int select_qresync_get_uids(struct imap_select_context *ctx, if (!seq_range_array_iter_nth(&seq_iter, n++, &seq)) return -1; - array_append(&ctx->qresync_sample_uidset, - &uid_range[i].seq2, 1); - array_append(&ctx->qresync_sample_seqset, &seq, 1); + array_push_back(&ctx->qresync_sample_uidset, + &uid_range[i].seq2); + array_push_back(&ctx->qresync_sample_seqset, &seq); } } if (seq_range_array_iter_nth(&seq_iter, n, &seq)) diff --git a/src/imap/cmd-thread.c b/src/imap/cmd-thread.c index 04b4a058b0..f2872445ae 100644 --- a/src/imap/cmd-thread.c +++ b/src/imap/cmd-thread.c @@ -218,7 +218,7 @@ static int imap_thread_orderedsubject(struct client_command_context *cmd, p_array_init(&cur_thread->msgs, pool, 4); } num = cmd->uid ? mail->uid : mail->seq; - array_append(&cur_thread->msgs, &num, 1); + array_push_back(&cur_thread->msgs, &num); } str_free(&prev_subject); ret = mailbox_search_deinit(&search_ctx); diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c index 1d84844c01..ebde6cb629 100644 --- a/src/imap/imap-client.c +++ b/src/imap/imap-client.c @@ -1536,7 +1536,7 @@ const char *const *client_enabled_features(struct client *client) for (unsigned int idx = 0; idx < count; idx++) { if (client_enabled[idx]) { feature = imap_feature_idx(idx); - array_append(&feature_strings, &feature->feature, 1); + array_push_back(&feature_strings, &feature->feature); } } array_append_zero(&feature_strings); diff --git a/src/imap/imap-commands-util.c b/src/imap/imap-commands-util.c index ee2d20c943..b64c9f9758 100644 --- a/src/imap/imap-commands-util.c +++ b/src/imap/imap-commands-util.c @@ -273,7 +273,7 @@ bool client_parse_mail_flags(struct client_command_context *cmd, } } else { /* keyword validity checks are done by lib-storage */ - array_append(&keywords, &atom, 1); + array_push_back(&keywords, &atom); } args++; @@ -356,7 +356,7 @@ client_get_keyword_names(struct client *client, ARRAY_TYPE(keywords) *dest, unsigned int kw_index = *kw_indexes; i_assert(kw_index < all_count); - array_append(dest, &all_names[kw_index], 1); + array_push_back(dest, &all_names[kw_index]); } array_append_zero(dest); diff --git a/src/imap/imap-state.c b/src/imap/imap-state.c index b7f4c1c705..0fc8e78ae5 100644 --- a/src/imap/imap-state.c +++ b/src/imap/imap-state.c @@ -375,7 +375,7 @@ import_send_expunges(struct client *client, while (seq_range_array_iter_nth(&iter, n, &expunged_uid) && expunged_uid < mail->uid && seq < state->messages) { seq++; n++; - array_append(&expunged_seqs, &seq, 1); + array_push_back(&expunged_seqs, &seq); crc = crc32_data_more(crc, &expunged_uid, sizeof(expunged_uid)); } @@ -388,7 +388,7 @@ import_send_expunges(struct client *client, while (seq_range_array_iter_nth(&iter, n, &expunged_uid) && seq < state->messages) { seq++; n++; - array_append(&expunged_seqs, &seq, 1); + array_push_back(&expunged_seqs, &seq); crc = crc32_data_more(crc, &expunged_uid, sizeof(expunged_uid)); } diff --git a/src/ipc/ipc-connection.c b/src/ipc/ipc-connection.c index d1c39b1d44..f31ca948cd 100644 --- a/src/ipc/ipc-connection.c +++ b/src/ipc/ipc-connection.c @@ -244,7 +244,7 @@ void ipc_connection_cmd(struct ipc_connection *conn, const char *cmd, ipc_cmd->conn = conn; ipc_cmd->callback = callback; ipc_cmd->context = context; - array_append(&conn->cmds, &ipc_cmd, 1); + array_push_back(&conn->cmds, &ipc_cmd); T_BEGIN { o_stream_nsend_str(conn->output, diff --git a/src/lib-auth/auth-master.c b/src/lib-auth/auth-master.c index e251c082d2..e843eed2a2 100644 --- a/src/lib-auth/auth-master.c +++ b/src/lib-auth/auth-master.c @@ -179,9 +179,9 @@ static const char *const *args_hide_passwords(const char *const *args) if (p != NULL && p < p2) { p = t_strconcat(t_strdup_until(args[i], p2), "=", NULL); - array_append(&new_args, &p, 1); + array_push_back(&new_args, &p); } else { - array_append(&new_args, &args[i], 1); + array_push_back(&new_args, &args[i]); } } array_append_zero(&new_args); diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c index 64471c6f31..7c83e580ba 100644 --- a/src/lib-dict-backend/dict-ldap.c +++ b/src/lib-dict-backend/dict-ldap.c @@ -82,12 +82,13 @@ dict_ldap_map_match(const struct dict_ldap_map *map, const char *path, pat--; if (path[len-1] == '/') { attribute = t_strndup(path, len-1); - array_append(values, &attribute, 1); + array_push_back(values, + &attribute); } else { - array_append(values, &path, 1); + array_push_back(values, &path); } } else { - array_append(values, &path, 1); + array_push_back(values, &path); path += len; } *path_len_r = path - path_start; @@ -98,12 +99,12 @@ dict_ldap_map_match(const struct dict_ldap_map *map, const char *path, p = strchr(path, '/'); if (p != NULL) { attribute = t_strdup_until(path, p); - array_append(values, &attribute, 1); + array_push_back(values, &attribute); path = p; } else { /* no '/' anymore, but it'll still match a partial */ - array_append(values, &path, 1); + array_push_back(values, &path); path += strlen(path); pat++; } @@ -202,7 +203,7 @@ ldap_dict_build_query(struct ldap_dict *dict, const struct dict_ldap_map *map, entry.key = '\0'; entry.value = ldap_escape(dict->username); entry.long_key = "username"; - array_append(&exp, &entry, 1); + array_push_back(&exp, &entry); if (priv) { template = t_strdup_printf("(&(%s=%s)%s)", map->username_attribute, "%{username}", map->filter); @@ -217,7 +218,7 @@ ldap_dict_build_query(struct ldap_dict *dict, const struct dict_ldap_map *map, entry.value = ldap_escape(*valuep); entry.long_key = *long_keyp; - array_append(&exp, &entry, 1); + array_push_back(&exp, &entry); } array_append_zero(&exp); diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c index b43773ab25..0cf252dad8 100644 --- a/src/lib-dict-backend/dict-sql.c +++ b/src/lib-dict-backend/dict-sql.c @@ -178,12 +178,13 @@ dict_sql_map_match(const struct dict_sql_map *map, const char *path, pat--; if (path[len-1] == '/') { field = t_strndup(path, len-1); - array_append(values, &field, 1); + array_push_back(values, + &field); } else { - array_append(values, &path, 1); + array_push_back(values, &path); } } else { - array_append(values, &path, 1); + array_push_back(values, &path); path += len; } *path_len_r = path - path_start; @@ -194,12 +195,12 @@ dict_sql_map_match(const struct dict_sql_map *map, const char *path, p = strchr(path, '/'); if (p != NULL) { field = t_strdup_until(path, p); - array_append(values, &field, 1); + array_push_back(values, &field); path = p; } else { /* no '/' anymore, but it'll still match a partial */ - array_append(values, &path, 1); + array_push_back(values, &path); path += strlen(path); pat++; } @@ -1194,7 +1195,7 @@ static void sql_dict_set_real(struct dict_transaction_context *_ctx, i_zero(&build); build.dict = dict; t_array_init(&build.fields, 1); - array_append(&build.fields, &field, 1); + array_push_back(&build.fields, &field); build.extra_values = &values; build.key1 = key[0]; @@ -1286,7 +1287,7 @@ static void sql_dict_atomic_inc_real(struct sql_dict_transaction_context *ctx, i_zero(&build); build.dict = dict; t_array_init(&build.fields, 1); - array_append(&build.fields, &field, 1); + array_push_back(&build.fields, &field); build.extra_values = &values; build.key1 = key[0]; diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c index 9b65c52495..aa728bdecb 100644 --- a/src/lib-dict/dict-client.c +++ b/src/lib-dict/dict-client.c @@ -657,7 +657,7 @@ static int client_dict_reconnect(struct client_dict *dict, const char *reason, duplicates. */ i++; } else { - array_append(&retry_cmds, cmdp, 1); + array_push_back(&retry_cmds, cmdp); array_delete(&dict->cmds, i, 1); } } diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c index 83022cb77e..a939f612dc 100644 --- a/src/lib-fs/fs-api.c +++ b/src/lib-fs/fs-api.c @@ -366,7 +366,7 @@ void fs_metadata_init_or_clear(struct fs_file *file) array_foreach(&file->metadata, md) { if (strncmp(md->key, FS_METADATA_INTERNAL_PREFIX, strlen(FS_METADATA_INTERNAL_PREFIX)) == 0) - array_append(&internal_metadata, md, 1); + array_push_back(&internal_metadata, md); } array_clear(&file->metadata); array_append_array(&file->metadata, &internal_metadata); diff --git a/src/lib-http/http-auth.c b/src/lib-http/http-auth.c index 1dc01c2202..67b7f6b171 100644 --- a/src/lib-http/http-auth.c +++ b/src/lib-http/http-auth.c @@ -101,7 +101,7 @@ http_parse_auth_params(struct http_parser *parser, (parser, ¶m.name, ¶m.value)) > 0) { if (!array_is_created(params)) t_array_init(params, 4); - array_append(params, ¶m, 1); + array_push_back(params, ¶m); count++; last = parser->cur; @@ -175,7 +175,7 @@ int http_auth_parse_challenges(const unsigned char *data, size_t size, if (!array_is_created(chlngs)) t_array_init(chlngs, 4); - array_append(chlngs, &chlng, 1); + array_push_back(chlngs, &chlng); /* OWS "," OWS --> also allow empty elements @@ -386,7 +386,7 @@ http_auth_params_clone(pool_t pool, nparam.name = p_strdup(pool, sparam->name); nparam.value = p_strdup(pool, sparam->value); - array_append(dst, &nparam, 1); + array_push_back(dst, &nparam); } } diff --git a/src/lib-http/http-client-queue.c b/src/lib-http/http-client-queue.c index aa43688e20..415227fffa 100644 --- a/src/lib-http/http-client-queue.c +++ b/src/lib-http/http-client-queue.c @@ -715,7 +715,7 @@ http_client_queue_request_timeout(struct http_client_queue *queue) &ioloop_timeval, TIMEOUT_CMP_MARGIN_USECS) > 0) { break; } - array_append(&failed_requests, &reqs[i], 1); + array_push_back(&failed_requests, &reqs[i]); } /* update timeout */ diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c index cffb00685e..7984446b47 100644 --- a/src/lib-imap-client/imapc-connection.c +++ b/src/lib-imap-client/imapc-connection.c @@ -312,7 +312,7 @@ imapc_connection_abort_commands_array(ARRAY_TYPE(imapc_command) *cmd_array, i++; } else { array_delete(cmd_array, i, 1); - array_append(dest_array, &cmd, 1); + array_push_back(dest_array, &cmd); } } } diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c index 256838393a..258a615716 100644 --- a/src/lib-imap-storage/imap-msgpart.c +++ b/src/lib-imap-storage/imap-msgpart.c @@ -164,7 +164,7 @@ imap_msgpart_get_header_fields(pool_t pool, const char *header_list, } value = p_strdup(pool, t_str_ucase(value)); - array_append(fields, &value, 1); + array_push_back(fields, &value); } /* istream-header-filter requires headers to be sorted */ array_sort(fields, i_strcasecmp_p); @@ -360,7 +360,7 @@ void imap_msgpart_get_wanted_headers(struct imap_msgpart *msgpart, return; for (i = 0; msgpart->headers[i] != NULL; i++) - array_append(headers, &msgpart->headers[i], 1); + array_push_back(headers, &msgpart->headers[i]); } static int diff --git a/src/lib-imap/imap-match.c b/src/lib-imap/imap-match.c index 0ac5fa2fc8..5ad7d0678f 100644 --- a/src/lib-imap/imap-match.c +++ b/src/lib-imap/imap-match.c @@ -190,7 +190,7 @@ imap_match_dup_real(pool_t pool, const struct imap_match_glob *glob) for (p = glob->patterns; p->pattern != NULL; p++) { if (p->inboxcase) inboxcase = TRUE; - array_append(&patterns, &p->pattern, 1); + array_push_back(&patterns, &p->pattern); } array_append_zero(&patterns); return imap_match_init_multiple_real(pool, array_first(&patterns), diff --git a/src/lib-index/mail-cache-compress.c b/src/lib-index/mail-cache-compress.c index 63007678fc..c27d188288 100644 --- a/src/lib-index/mail-cache-compress.c +++ b/src/lib-index/mail-cache-compress.c @@ -286,7 +286,7 @@ mail_cache_copy(struct mail_cache *cache, struct mail_index_transaction *trans, record_count++; } - array_append(ext_offsets, &ext_offset, 1); + array_push_back(ext_offsets, &ext_offset); } i_assert(orig_fields_count == cache->fields_count); diff --git a/src/lib-index/mail-index-fsck.c b/src/lib-index/mail-index-fsck.c index 4a1f956ce8..1a2f4624ba 100644 --- a/src/lib-index/mail-index-fsck.c +++ b/src/lib-index/mail-index-fsck.c @@ -192,7 +192,7 @@ mail_index_fsck_keywords(struct mail_index *index, struct mail_index_map *map, /* duplicate */ name = ""; } - array_append(&names, &name, 1); + array_push_back(&names, &name); } /* give new names to invalid keywords */ @@ -311,7 +311,7 @@ mail_index_fsck_extensions(struct mail_index *index, struct mail_index_map *map, ext_hdr, offset, &next_offset); } - array_append(&names, &name, 1); + array_push_back(&names, &name); offset = next_offset; continue; } diff --git a/src/lib-index/mail-index-sync.c b/src/lib-index/mail-index-sync.c index c48b125000..17652f0012 100644 --- a/src/lib-index/mail-index-sync.c +++ b/src/lib-index/mail-index-sync.c @@ -945,7 +945,7 @@ bool mail_index_sync_keywords_apply(const struct mail_index_sync_rec *sync_rec, return FALSE; } - array_append(keywords, &idx, 1); + array_push_back(keywords, &idx); return TRUE; case MAIL_INDEX_SYNC_TYPE_KEYWORD_REMOVE: for (i = 0; i < count; i++) { diff --git a/src/lib-index/mail-index-transaction-sort-appends.c b/src/lib-index/mail-index-transaction-sort-appends.c index 8e7988359d..c2a29d309e 100644 --- a/src/lib-index/mail-index-transaction-sort-appends.c +++ b/src/lib-index/mail-index-transaction-sort-appends.c @@ -82,7 +82,7 @@ sort_appends_seq_range(ARRAY_TYPE(seq_range) *array, uint32_t first_new_seq, if (range[i].seq1 < first_new_seq) { temp_range.seq1 = first_new_seq; temp_range.seq2 = range[i].seq2; - array_append(&old_seqs, &temp_range, 1); + array_push_back(&old_seqs, &temp_range); range[i].seq2 = first_new_seq - 1; i++; } diff --git a/src/lib-index/mail-index-transaction-update.c b/src/lib-index/mail-index-transaction-update.c index 02468c2eaa..560d30710f 100644 --- a/src/lib-index/mail-index-transaction-update.c +++ b/src/lib-index/mail-index-transaction-update.c @@ -1141,7 +1141,7 @@ keyword_update_remove_existing(struct mail_index_transaction *t, uint32_t seq) really care about performance that much here, */ keywords_count = array_count(&t->view->index->keywords); for (i = 0; i < keywords_count; i++) - array_append(&keywords, &i, 1); + array_push_back(&keywords, &i); } else { mail_index_transaction_lookup_latest_keywords(t, seq, &keywords); } diff --git a/src/lib-index/mail-index-transaction-view.c b/src/lib-index/mail-index-transaction-view.c index f2b2197760..75ff66453e 100644 --- a/src/lib-index/mail-index-transaction-view.c +++ b/src/lib-index/mail-index-transaction-view.c @@ -270,7 +270,7 @@ static void keyword_index_add(ARRAY_TYPE(keyword_indexes) *keywords, if (indexes[i] == idx) return; } - array_append(keywords, &idx, 1); + array_push_back(keywords, &idx); } static void keyword_index_remove(ARRAY_TYPE(keyword_indexes) *keywords, diff --git a/src/lib-index/mail-index-view.c b/src/lib-index/mail-index-view.c index 41e94a5db7..d51dbdda63 100644 --- a/src/lib-index/mail-index-view.c +++ b/src/lib-index/mail-index-view.c @@ -329,7 +329,7 @@ mail_index_data_lookup_keywords(struct mail_index_map *map, } index_idx = keyword_idx_map[idx]; - array_append(keyword_idx, &index_idx, 1); + array_push_back(keyword_idx, &index_idx); } } } diff --git a/src/lib-ldap/ldap-entry.c b/src/lib-ldap/ldap-entry.c index cc437e5bae..ea4249df3e 100644 --- a/src/lib-ldap/ldap-entry.c +++ b/src/lib-ldap/ldap-entry.c @@ -25,20 +25,20 @@ int ldap_entry_init(struct ldap_entry *obj, struct ldap_result *result, while(tmp != NULL) { struct ldap_attribute *attr = p_new(result->pool, struct ldap_attribute, 1); attr->name = p_strdup(result->pool, tmp); - array_append(&attr_names, &attr->name, 1); + array_push_back(&attr_names, &attr->name); values = ldap_get_values_len(result->conn->conn, message, tmp); if (values != NULL) { count = ldap_count_values_len(values); p_array_init(&attr->values, result->pool, count); for(int i = 0; i < count; i++) { const char *ptr = p_strndup(result->pool, values[i]->bv_val, values[i]->bv_len); - array_append(&attr->values, &ptr, 1); + array_push_back(&attr->values, &ptr); } ldap_value_free_len(values); } array_append_zero(&attr->values); ldap_memfree(tmp); - array_append(&obj->attributes, attr, 1); + array_push_back(&obj->attributes, attr); tmp = ldap_next_attribute(result->conn->conn, message, bptr); } diff --git a/src/lib-ldap/ldap-search.c b/src/lib-ldap/ldap-search.c index 9a5d481e0b..9d24135630 100644 --- a/src/lib-ldap/ldap-search.c +++ b/src/lib-ldap/ldap-search.c @@ -154,7 +154,7 @@ void ldap_connection_search_start(struct ldap_connection *conn, p_array_init(&arr, req->pool, 8); for(const char **ptr = (const char**)input->attributes; *ptr != NULL; ptr++) { const char *tmp = p_strdup(req->pool, *ptr); - array_append(&arr, &tmp, 1); + array_push_back(&arr, &tmp); } array_append_zero(&arr); req->input.search.attributes = array_first_modifiable(&arr); diff --git a/src/lib-mail/message-part-data.c b/src/lib-mail/message-part-data.c index 74766fb77a..d612a7802a 100644 --- a/src/lib-mail/message-part-data.c +++ b/src/lib-mail/message-part-data.c @@ -386,7 +386,7 @@ parse_content_language(struct message_part_data *data, while (rfc822_parse_atom(&parser, str) >= 0) { const char *lang = p_strdup(pool, str_c(str)); - array_append(&langs, &lang, 1); + array_push_back(&langs, &lang); str_truncate(str, 0); if (parser.data >= parser.end || *parser.data != ',') diff --git a/src/lib-mail/ostream-dot.c b/src/lib-mail/ostream-dot.c index 3909801cae..678ffd3711 100644 --- a/src/lib-mail/ostream-dot.c +++ b/src/lib-mail/ostream-dot.c @@ -165,7 +165,7 @@ o_stream_dot_sendv(struct ostream_private *stream, /* forward chunk to new iovec */ iovn.iov_base = data; iovn.iov_len = chunk; - array_append(&iov_arr, &iovn, 1); + array_push_back(&iov_arr, &iovn); data = p; i_assert(max_bytes >= chunk); max_bytes -= chunk; @@ -175,7 +175,7 @@ o_stream_dot_sendv(struct ostream_private *stream, data++; iovn.iov_base = (add == '\r' ? "\r\n" : ".."); iovn.iov_len = 2; - array_append(&iov_arr, &iovn, 1); + array_push_back(&iov_arr, &iovn); i_assert(max_bytes >= 2); max_bytes -= 2; added++; @@ -190,7 +190,7 @@ o_stream_dot_sendv(struct ostream_private *stream, if (chunk > 0) { iovn.iov_base = data; iovn.iov_len = chunk; - array_append(&iov_arr, &iovn, 1); + array_push_back(&iov_arr, &iovn); i_assert(max_bytes >= chunk); max_bytes -= chunk; sent += chunk; diff --git a/src/lib-mail/rfc2231-parser.c b/src/lib-mail/rfc2231-parser.c index 4f15499808..e7c9ee2527 100644 --- a/src/lib-mail/rfc2231-parser.c +++ b/src/lib-mail/rfc2231-parser.c @@ -93,14 +93,14 @@ int rfc2231_parse(struct rfc822_parser_context *ctx, else { rfc2231_param.key = t_strdup_until(key, p2); rfc2231_param.value = t_strdup(str_c(str)); - array_append(&rfc2231_params_arr, - &rfc2231_param, 1); + array_push_back(&rfc2231_params_arr, + &rfc2231_param); } } if (p == NULL) { const char *value = t_strdup(str_c(str)); - array_append(&result, &key, 1); - array_append(&result, &value, 1); + array_push_back(&result, &key); + array_push_back(&result, &value); } } ctx->nul_replacement_str = prev_replacement_str; @@ -146,9 +146,9 @@ int rfc2231_parse(struct rfc822_parser_context *ctx, "%s*%u*" : "%s*%u", rfc2231_params[j].key, rfc2231_params[j].idx); - array_append(&result, &key, 1); - array_append(&result, - &rfc2231_params[j].value, 1); + array_push_back(&result, &key); + array_push_back(&result, + &rfc2231_params[j].value); } } else { /* everything was successful */ @@ -169,8 +169,8 @@ int rfc2231_parse(struct rfc822_parser_context *ctx, if (have_extended) key = t_strconcat(key, "*", NULL); const char *value = t_strdup(str_c(str)); - array_append(&result, &key, 1); - array_append(&result, &value, 1); + array_push_back(&result, &key); + array_push_back(&result, &value); } } array_append_zero(&result); /* NULL-terminate */ diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c index 11ba4f0b8a..be9d8b8458 100644 --- a/src/lib-master/master-service-settings.c +++ b/src/lib-master/master-service-settings.c @@ -155,7 +155,7 @@ static int parse_query(const char *str, struct event_filter_query *query_r, str = strchr(str, ':'); i_assert(str != NULL); str++; - array_append(&categories, &str, 1); + array_push_back(&categories, &str); } else { *error_r = t_strdup_printf("Unknown event '%s'", str); return -1; @@ -537,7 +537,7 @@ config_read_reply_header(struct istream *istream, const char *path, pool_t pool, output_r->used_remote = TRUE; else if (str_begins(*arg, "service=")) { const char *name = p_strdup(pool, *arg + 8); - array_append(&services, &name, 1); + array_push_back(&services, &name); } } if (input->service == NULL) { @@ -608,7 +608,7 @@ int master_service_settings_get_filters(struct master_service *service, break; if (str_begins(line, "FILTER\t")) { line = t_strdup(line+7); - array_append(&filters_tmp, &line, 1); + array_push_back(&filters_tmp, &line); } } i_stream_unref(&is); @@ -673,14 +673,14 @@ int master_service_settings_read(struct master_service *service, p_array_init(&all_roots, service->set_pool, 8); tmp_root = &master_service_setting_parser_info; - array_append(&all_roots, &tmp_root, 1); + array_push_back(&all_roots, &tmp_root); if (service->want_ssl_settings) { tmp_root = &master_service_ssl_setting_parser_info; - array_append(&all_roots, &tmp_root, 1); + array_push_back(&all_roots, &tmp_root); } if (input->roots != NULL) { for (i = 0; input->roots[i] != NULL; i++) - array_append(&all_roots, &input->roots[i], 1); + array_push_back(&all_roots, &input->roots[i]); } parser = settings_parser_init_list(service->set_pool, diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c index 5addcc7ee1..9c1f397852 100644 --- a/src/lib-master/master-service.c +++ b/src/lib-master/master-service.c @@ -640,7 +640,7 @@ static void master_service_import_environment_real(const char *import_environmen /* preserve existing DOVECOT_PRESERVE_ENVS */ value = getenv(DOVECOT_PRESERVE_ENVS_ENV); if (value != NULL) - array_append(&keys, &value, 1); + array_push_back(&keys, &value); /* add new environments */ envs = t_strsplit_spaces(import_environment, " "); for (; *envs != NULL; envs++) { @@ -651,7 +651,7 @@ static void master_service_import_environment_real(const char *import_environmen key = t_strdup_until(*envs, value); env_put(*envs); } - array_append(&keys, &key, 1); + array_push_back(&keys, &key); } array_append_zero(&keys); diff --git a/src/lib-program-client/program-client-local.c b/src/lib-program-client/program-client-local.c index 6798e72a9a..86d6db6426 100644 --- a/src/lib-program-client/program-client-local.c +++ b/src/lib-program-client/program-client-local.c @@ -103,10 +103,10 @@ void exec_child(const char *bin_path, const char *const *args, /* Compose argv */ t_array_init(&exec_args, 16); - array_append(&exec_args, &bin_path, 1); + array_push_back(&exec_args, &bin_path); if (args != NULL) { for(; *args != NULL; args++) - array_append(&exec_args, args, 1); + array_push_back(&exec_args, args); } (void) array_append_space(&exec_args); diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c index 8e4b5bc828..2fdfcd03db 100644 --- a/src/lib-settings/settings-parser.c +++ b/src/lib-settings/settings-parser.c @@ -116,12 +116,12 @@ copy_unique_defaults(struct setting_parser_context *ctx, for (i = 0; i < count; i++) T_BEGIN { new_set = p_malloc(ctx->set_pool, info.struct_size); - array_append(arr, &new_set, 1); + array_push_back(arr, &new_set); if (link->change_struct != NULL) { i_assert(carr != NULL); new_changes = p_malloc(ctx->set_pool, info.struct_size); - array_append(carr, &new_changes, 1); + array_push_back(carr, &new_changes); } keyp = CONST_PTR_OFFSET(children[i], info.type_offset); @@ -1091,7 +1091,7 @@ int settings_parse_environ(struct setting_parser_context *ctx) in environ[] */ i_array_init(&sorted_envs_arr, 128); for (i = 0; environ[i] != NULL; i++) - array_append(&sorted_envs_arr, &environ[i], 1); + array_push_back(&sorted_envs_arr, &environ[i]); array_sort(&sorted_envs_arr, environ_cmp); sorted_envs = array_get(&sorted_envs_arr, &count); @@ -1567,9 +1567,9 @@ setting_copy(enum setting_type type, const void *src, void *dest, pool_t pool, continue; } dup = keep_values ? strings[i] : p_strdup(pool, strings[i]); - array_append(dest_arr, &dup, 1); + array_push_back(dest_arr, &dup); dup = keep_values ? strings[i+1] : p_strdup(pool, strings[i+1]); - array_append(dest_arr, &dup, 1); + array_push_back(dest_arr, &dup); } break; } @@ -1611,7 +1611,7 @@ static void *settings_dup_full(const struct setting_parser_info *info, child_set = settings_dup_full(def->list_info, children[i], pool, keep_values); - array_append(dest_arr, &child_set, 1); + array_push_back(dest_arr, &child_set); settings_set_parent(def->list_info, child_set, dest_set); } @@ -1678,7 +1678,7 @@ settings_changes_dup(const struct setting_parser_info *info, child_set = settings_changes_dup(def->list_info, children[i], pool); - array_append(dest_arr, &child_set, 1); + array_push_back(dest_arr, &child_set); } break; } @@ -1706,7 +1706,7 @@ info_update_real(pool_t pool, struct setting_parser_info *parent, t_array_init(&defines, 128); /* add existing defines */ for (j = 0; parent->defines[j].key != NULL; j++) - array_append(&defines, &parent->defines[j], 1); + array_push_back(&defines, &parent->defines[j]); new_struct_size = MEM_ALIGN(parent->struct_size); /* add new dynamic defines */ @@ -1716,7 +1716,7 @@ info_update_real(pool_t pool, struct setting_parser_info *parent, for (j = 0; cur_defines[j].key != NULL; j++) { new_define = cur_defines[j]; new_define.offset += new_struct_size; - array_append(&defines, &new_define, 1); + array_push_back(&defines, &new_define); } new_struct_size += MEM_ALIGN(parsers[i].info->struct_size); } @@ -1741,8 +1741,8 @@ info_update_real(pool_t pool, struct setting_parser_info *parent, t_array_init(&dynamic_parsers, 32); if (parent->dynamic_parsers != NULL) { for (i = 0; parent->dynamic_parsers[i].name != NULL; i++) { - array_append(&dynamic_parsers, - &parent->dynamic_parsers[i], 1); + array_push_back(&dynamic_parsers, + &parent->dynamic_parsers[i]); } } offset = MEM_ALIGN(parent->struct_size); @@ -1750,7 +1750,7 @@ info_update_real(pool_t pool, struct setting_parser_info *parent, new_parser = parsers[i]; new_parser.name = p_strdup(pool, new_parser.name); new_parser.struct_offset = offset; - array_append(&dynamic_parsers, &new_parser, 1); + array_push_back(&dynamic_parsers, &new_parser); offset += MEM_ALIGN(parsers[i].info->struct_size); } parent->dynamic_parsers = @@ -1996,7 +1996,7 @@ settings_changes_init(const struct setting_parser_info *info, for (i = 0; i < count; i++) { set = settings_changes_init(def->list_info, children[i], pool); - array_append(dest_arr, &set, 1); + array_push_back(dest_arr, &set); } } } @@ -2024,7 +2024,7 @@ static void settings_copy_deflist(const struct setting_define *def, p_array_init(dest_arr, pool, count); for (i = 0; i < count; i++) { child_set = settings_dup(def->list_info, children[i], pool); - array_append(dest_arr, &child_set, 1); + array_push_back(dest_arr, &child_set); settings_set_parent(def->list_info, child_set, dest_link->set_struct); } @@ -2036,7 +2036,7 @@ static void settings_copy_deflist(const struct setting_define *def, for (i = 0; i < count; i++) { child_set = settings_changes_init(def->list_info, children[i], pool); - array_append(dest_arr, &child_set, 1); + array_push_back(dest_arr, &child_set); } } @@ -2103,14 +2103,14 @@ settings_copy_deflist_unique(const struct setting_define *def, /* append */ child_set = settings_dup(def->list_info, src_children[i], pool); - array_append(dest_arr, &child_set, 1); + array_push_back(dest_arr, &child_set); settings_set_parent(def->list_info, child_set, dest_link->set_struct); child_set = settings_changes_init(def->list_info, src_cchildren[i], pool); - array_append(dest_carr, &child_set, 1); + array_push_back(dest_carr, &child_set); } } return 0; diff --git a/src/lib-smtp/smtp-client-command.c b/src/lib-smtp/smtp-client-command.c index 21f66cd261..569261eefd 100644 --- a/src/lib-smtp/smtp-client-command.c +++ b/src/lib-smtp/smtp-client-command.c @@ -380,7 +380,7 @@ void smtp_client_commands_list_abort(struct smtp_client_command *cmds_list, t_array_init(&cmds_arr, cmds_list_count); for (cmd = cmds_list; cmd != NULL; cmd = cmd->next) { smtp_client_command_ref(cmd); - array_append(&cmds_arr, &cmd, 1); + array_push_back(&cmds_arr, &cmd); } cmds = array_get_modifiable(&cmds_arr, &count); @@ -411,7 +411,7 @@ void smtp_client_commands_list_fail_reply( t_array_init(&cmds_arr, cmds_list_count); for (cmd = cmds_list; cmd != NULL; cmd = cmd->next) { smtp_client_command_ref(cmd); - array_append(&cmds_arr, &cmd, 1); + array_push_back(&cmds_arr, &cmd); } cmds = array_get_modifiable(&cmds_arr, &count); diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c index d28c22e7f3..b2ce59a166 100644 --- a/src/lib-smtp/smtp-server-connection.c +++ b/src/lib-smtp/smtp-server-connection.c @@ -915,7 +915,7 @@ smtp_server_connection_alloc(struct smtp_server *server, str_array_length(set->mail_param_extensions) + 8); for (extp = set->mail_param_extensions; *extp != NULL; extp++) { const char *ext = p_strdup(pool, *extp); - array_append(&conn->mail_param_extensions, &ext, 1); + array_push_back(&conn->mail_param_extensions, &ext); } array_append_zero(&conn->mail_param_extensions); } @@ -926,7 +926,7 @@ smtp_server_connection_alloc(struct smtp_server *server, str_array_length(set->rcpt_param_extensions) + 8); for (extp = set->rcpt_param_extensions; *extp != NULL; extp++) { const char *ext = p_strdup(pool, *extp); - array_append(&conn->rcpt_param_extensions, &ext, 1); + array_push_back(&conn->rcpt_param_extensions, &ext); } array_append_zero(&conn->rcpt_param_extensions); } diff --git a/src/lib-smtp/smtp-submit.c b/src/lib-smtp/smtp-submit.c index 7e9b89aeb2..da7c3b1951 100644 --- a/src/lib-smtp/smtp-submit.c +++ b/src/lib-smtp/smtp-submit.c @@ -365,18 +365,18 @@ smtp_submit_send_sendmail(struct smtp_submit *subm) i_assert(sendmail_args[0] != NULL); sendmail_bin = sendmail_args[0]; for (i = 1; sendmail_args[i] != NULL; i++) - array_append(&args, &sendmail_args[i], 1); + array_push_back(&args, &sendmail_args[i]); - str = "-i"; array_append(&args, &str, 1); /* ignore dots */ - str = "-f"; array_append(&args, &str, 1); + str = "-i"; array_push_back(&args, &str); /* ignore dots */ + str = "-f"; array_push_back(&args, &str); str = !smtp_address_isnull(subm->mail_from) ? smtp_address_encode(subm->mail_from) : "<>"; - array_append(&args, &str, 1); + array_push_back(&args, &str); - str = "--"; array_append(&args, &str, 1); + str = "--"; array_push_back(&args, &str); array_foreach(&subm->rcpt_to, rcptp) { const char *rcpt = smtp_address_encode(*rcptp); - array_append(&args, &rcpt, 1); + array_push_back(&args, &rcpt); } array_append_zero(&args); diff --git a/src/lib-smtp/smtp-syntax.c b/src/lib-smtp/smtp-syntax.c index 6c1234fed7..f4a64a785e 100644 --- a/src/lib-smtp/smtp-syntax.c +++ b/src/lib-smtp/smtp-syntax.c @@ -260,7 +260,7 @@ static int smtp_parse_ehlo_line(struct smtp_parser *parser, } if (params_r != NULL) { param = p_strdup_until(parser->pool, pbegin, parser->cur); - array_append(¶ms, ¶m, 1); + array_push_back(¶ms, ¶m); } pbegin = parser->cur + 1; } else if (!smtp_char_is_ehlo_param(*parser->cur)) { @@ -272,7 +272,7 @@ static int smtp_parse_ehlo_line(struct smtp_parser *parser, if (params_r != NULL) { param = p_strdup_until(parser->pool, pbegin, parser->cur); - array_append(¶ms, ¶m, 1); + array_push_back(¶ms, ¶m); array_append_zero(¶ms); *params_r = array_first(¶ms); } diff --git a/src/lib-sql/driver-sqlpool.c b/src/lib-sql/driver-sqlpool.c index 1be7f2666c..929ce3bfc0 100644 --- a/src/lib-sql/driver-sqlpool.c +++ b/src/lib-sql/driver-sqlpool.c @@ -449,9 +449,9 @@ driver_sqlpool_parse_hosts(struct sqlpool_db *db, const char *connect_string, return -1; } } else if (strcmp(key, "host") == 0) { - array_append(&hostnames, &value, 1); + array_push_back(&hostnames, &value); } else { - array_append(&connect_args, args, 1); + array_push_back(&connect_args, args); } } diff --git a/src/lib-storage/index/dbox-multi/mdbox-map.c b/src/lib-storage/index/dbox-multi/mdbox-map.c index dc03b0ce1f..cb0cc29f1b 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-map.c +++ b/src/lib-storage/index/dbox-multi/mdbox-map.c @@ -423,7 +423,7 @@ int mdbox_map_get_file_msgs(struct mdbox_map *map, uint32_t file_id, msg.map_uid = rec.map_uid; msg.offset = rec.rec.offset; msg.refcount = rec.refcount; - array_append(recs, &msg, 1); + array_push_back(recs, &msg); } } return 0; diff --git a/src/lib-storage/index/dbox-multi/mdbox-purge.c b/src/lib-storage/index/dbox-multi/mdbox-purge.c index a9b635380d..b65ae1211d 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-purge.c +++ b/src/lib-storage/index/dbox-multi/mdbox-purge.c @@ -371,7 +371,7 @@ mdbox_file_purge(struct mdbox_purge_context *ctx, struct dbox_file *file, ret = mdbox_purge_save_msg(ctx, file, &msgs[i]); if (ret <= 0) break; - array_append(&copied_map_uids, &msgs[i].map_uid, 1); + array_push_back(&copied_map_uids, &msgs[i].map_uid); } offset = file->input->v_offset; } diff --git a/src/lib-storage/index/dbox-single/sdbox-copy.c b/src/lib-storage/index/dbox-single/sdbox-copy.c index 116ab770b7..9d8aa9e36f 100644 --- a/src/lib-storage/index/dbox-single/sdbox-copy.c +++ b/src/lib-storage/index/dbox-single/sdbox-copy.c @@ -79,8 +79,8 @@ sdbox_file_copy_attachments(struct sdbox_file *src_file, fs_last_error(dest_storage->attachment_fs)); ret = -1; } else { - array_append(&dest_file->attachment_paths, - &dest_relpath, 1); + array_push_back(&dest_file->attachment_paths, + &dest_relpath); } fs_file_deinit(&src_fsfile); fs_file_deinit(&dest_fsfile); diff --git a/src/lib-storage/index/dbox-single/sdbox-save.c b/src/lib-storage/index/dbox-single/sdbox-save.c index b07e915d3d..a0fb58be9a 100644 --- a/src/lib-storage/index/dbox-single/sdbox-save.c +++ b/src/lib-storage/index/dbox-single/sdbox-save.c @@ -164,7 +164,7 @@ static int dbox_save_mail_write_metadata(struct dbox_save_context *ctx, for (i = 0; i < count; i++) { const char *path = p_strdup(sfile->attachment_pool, extrefs[i].path); - array_append(&sfile->attachment_paths, &path, 1); + array_push_back(&sfile->attachment_paths, &path); } } return 0; diff --git a/src/lib-storage/index/imapc/imapc-mail-fetch.c b/src/lib-storage/index/imapc/imapc-mail-fetch.c index 695edc8a79..4f902dc835 100644 --- a/src/lib-storage/index/imapc/imapc-mail-fetch.c +++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c @@ -125,14 +125,14 @@ headers_merge(pool_t pool, const char *const *h1, const char *const *h2) if (h1 != NULL) { for (i = 0; h1[i] != NULL; i++) { value = p_strdup(pool, h1[i]); - array_append(&headers, &value, 1); + array_push_back(&headers, &value); } } if (h2 != NULL) { for (i = 0; h2[i] != NULL; i++) { if (h1 == NULL || !str_array_icase_find(h1, h2[i])) { value = p_strdup(pool, h2[i]); - array_append(&headers, &value, 1); + array_push_back(&headers, &value); } } } @@ -727,7 +727,7 @@ imapc_fetch_header_stream(struct imapc_mail *mail, (parse it even if it's not) */ t_array_init(&hdr_arr, 16); while (imap_arg_get_astring(hdr_list, &value)) { - array_append(&hdr_arr, &value, 1); + array_push_back(&hdr_arr, &value); hdr_list++; } if (hdr_list->type != IMAP_ARG_EOL) diff --git a/src/lib-storage/index/imapc/imapc-mailbox.c b/src/lib-storage/index/imapc/imapc-mailbox.c index 821ee086c5..5d08acf68e 100644 --- a/src/lib-storage/index/imapc/imapc-mailbox.c +++ b/src/lib-storage/index/imapc/imapc-mailbox.c @@ -489,7 +489,7 @@ static void imapc_untagged_fetch(const struct imapc_untagged_reply *reply, flags |= imap_parse_system_flag(atom); else { /* keyword */ - array_append(&keywords, &atom, 1); + array_push_back(&keywords, &atom); } } } else if (strcasecmp(atom, "MODSEQ") == 0 && @@ -588,7 +588,7 @@ static void imapc_untagged_fetch(const struct imapc_untagged_reply *reply, this can be used for "All Mail" mailbox migrations with dsync */ atom = "$GMailHaveLabels"; - array_append(&keywords, &atom, 1); + array_push_back(&keywords, &atom); } array_append_zero(&keywords); @@ -685,7 +685,7 @@ imapc_untagged_esearch_gmail_pop3(const struct imap_arg *args, mbox->storage->set->pop3_deleted_flag, &pop3_deleted_kw_idx); t_array_init(&keywords, 1); - array_append(&keywords, &pop3_deleted_kw_idx, 1); + array_push_back(&keywords, &pop3_deleted_kw_idx); kw = mail_index_keywords_create_from_indexes(mbox->box.index, &keywords); msgmap = imapc_client_mailbox_get_msgmap(mbox->client_box); diff --git a/src/lib-storage/index/index-attachment.c b/src/lib-storage/index/index-attachment.c index e31fca24b9..5256bba52a 100644 --- a/src/lib-storage/index/index-attachment.c +++ b/src/lib-storage/index/index-attachment.c @@ -391,7 +391,7 @@ bool index_attachment_parse_extrefs(const char *line, pool_t pool, (extref.start_offset - last_voffset); extref.path = p_strdup(pool, path); - array_append(extrefs, &extref, 1); + array_push_back(extrefs, &extref); } return TRUE; } diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c index 969a91c196..926f1072f7 100644 --- a/src/lib-storage/index/index-mail-headers.c +++ b/src/lib-storage/index/index-mail-headers.c @@ -351,7 +351,7 @@ void index_mail_parse_header(struct message_part *part, str_append(mail->header_data, "\n"); if (!hdr->continues) { data->parse_line.end_pos = str_len(mail->header_data); - array_append(&mail->header_lines, &data->parse_line, 1); + array_push_back(&mail->header_lines, &data->parse_line); } } @@ -616,7 +616,7 @@ index_mail_get_parsed_header(struct index_mail *mail, unsigned int field_idx) value = message_header_strdup(mail->mail.data_pool, value_start, value_end - value_start); - array_append(&header_values, &value, 1); + array_push_back(&header_values, &value); } } @@ -702,7 +702,7 @@ index_mail_get_raw_headers(struct index_mail *mail, const char *field, data + i, len2); i += len2 + 1; - array_append(&header_values, &value, 1); + array_push_back(&header_values, &value); } } diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c index 3a334da3dc..8810b3c93c 100644 --- a/src/lib-storage/index/index-mail.c +++ b/src/lib-storage/index/index-mail.c @@ -2078,9 +2078,10 @@ void index_mail_add_temp_wanted_fields(struct mail *_mail, /* merge headers */ t_array_init(&names, 32); for (i = 0; i < data->wanted_headers->count; i++) - array_append(&names, &data->wanted_headers->name[i], 1); + array_push_back(&names, + &data->wanted_headers->name[i]); for (i = 0; i < headers->count; i++) - array_append(&names, &headers->name[i], 1); + array_push_back(&names, &headers->name[i]); array_append_zero(&names); new_wanted_headers = mailbox_header_lookup_init(_mail->box, diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c index e13389ac8f..42328500aa 100644 --- a/src/lib-storage/index/index-search.c +++ b/src/lib-storage/index/index-search.c @@ -1252,12 +1252,12 @@ wanted_sort_fields_get(struct mailbox *box, break; } if (header != NULL) - array_append(&headers, &header, 1); + array_push_back(&headers, &header); } if (wanted_headers != NULL) { for (i = 0; wanted_headers->name[i] != NULL; i++) - array_append(&headers, &wanted_headers->name[i], 1); + array_push_back(&headers, &wanted_headers->name[i]); } if (array_count(&headers) > 0) { @@ -1744,7 +1744,7 @@ static int search_more_with_prefetching(struct index_search_context *ctx, *mail_r = mails[0]; if (--ctx->unused_mail_idx > 0) { array_delete(&ctx->mails, 0, 1); - array_append(&ctx->mails, mail_r, 1); + array_push_back(&ctx->mails, mail_r); } index_mail_update_access_parts_post(*mail_r); return 1; diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c index 1150596011..0efda02ebc 100644 --- a/src/lib-storage/index/index-storage.c +++ b/src/lib-storage/index/index-storage.c @@ -497,7 +497,7 @@ index_storage_mailbox_update_cache(struct mailbox *box, field.decision = updates[i].decision; if (updates[i].last_used != (time_t)-1) field.last_used = updates[i].last_used; - array_append(&new_fields, &field, 1); + array_push_back(&new_fields, &field); } if (array_count(&new_fields) > 0) { mail_cache_register_fields(box->cache, diff --git a/src/lib-storage/index/index-thread-finish.c b/src/lib-storage/index/index-thread-finish.c index 9f82ad7acf..927a5d7909 100644 --- a/src/lib-storage/index/index-thread-finish.c +++ b/src/lib-storage/index/index-thread-finish.c @@ -185,13 +185,13 @@ thread_sort_children(struct thread_finish_context *ctx, uint32_t parent_idx, /* only child - don't bother setting sort date */ child.uid = thread_lookup_existing(ctx, child.idx); - array_append(sorted_children, &child, 1); + array_push_back(sorted_children, &child); return; } while (child.idx != 0) { thread_child_node_fill(ctx, &child); - array_append(sorted_children, &child, 1); + array_push_back(sorted_children, &child); child.idx = shadows[child.idx].next_sibling_idx; } diff --git a/src/lib-storage/index/maildir/maildir-filename-flags.c b/src/lib-storage/index/maildir/maildir-filename-flags.c index 42275128ca..c35f70794d 100644 --- a/src/lib-storage/index/maildir/maildir-filename-flags.c +++ b/src/lib-storage/index/maildir/maildir-filename-flags.c @@ -49,8 +49,8 @@ void maildir_filename_flags_get(struct maildir_keywords_sync_ctx *ctx, break; } - array_append(keywords_r, - (unsigned int *)&idx, 1); + array_push_back(keywords_r, + (unsigned int *)&idx); break; } diff --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c index e4e98c30dc..acb4b33f73 100644 --- a/src/lib-storage/index/maildir/maildir-save.c +++ b/src/lib-storage/index/maildir/maildir-save.c @@ -866,7 +866,7 @@ maildir_save_move_files_to_newcur(struct maildir_save_context *ctx) filenames within this transaction. */ t_array_init(&files, ctx->files_count); for (mf = ctx->files; mf != NULL; mf = mf->next) - array_append(&files, &mf, 1); + array_push_back(&files, &mf); array_sort(&files, maildir_filename_dest_basename_cmp); new_changed = cur_changed = FALSE; diff --git a/src/lib-storage/index/maildir/maildir-uidlist.c b/src/lib-storage/index/maildir/maildir-uidlist.c index 2c3111c48a..800bcf4a4d 100644 --- a/src/lib-storage/index/maildir/maildir-uidlist.c +++ b/src/lib-storage/index/maildir/maildir-uidlist.c @@ -563,7 +563,7 @@ static bool maildir_uidlist_next(struct maildir_uidlist *uidlist, rec->filename = p_strdup(uidlist->record_pool, line); hash_table_update(uidlist->files, rec->filename, rec); - array_append(&uidlist->records, &rec, 1); + array_push_back(&uidlist->records, &rec); return TRUE; } @@ -1365,7 +1365,7 @@ maildir_uidlist_records_drop_expunges(struct maildir_uidlist *uidlist) syncing it here. ignore this entry. */ seq++; } else { - array_append(&new_records, &recs[i], 1); + array_push_back(&new_records, &recs[i]); seq++; i++; } } @@ -1378,7 +1378,7 @@ maildir_uidlist_records_drop_expunges(struct maildir_uidlist *uidlist) /* view might not be completely up-to-date, so preserve any messages left */ for (; i < count; i++) - array_append(&new_records, &recs[i], 1); + array_push_back(&new_records, &recs[i]); array_free(&uidlist->records); uidlist->records = new_records; diff --git a/src/lib-storage/index/mbox/mbox-sync-parse.c b/src/lib-storage/index/mbox/mbox-sync-parse.c index 7257b0d885..99bf7e66be 100644 --- a/src/lib-storage/index/mbox/mbox-sync-parse.c +++ b/src/lib-storage/index/mbox/mbox-sync-parse.c @@ -302,7 +302,7 @@ static bool parse_x_keywords_real(struct mbox_sync_mail_context *ctx, } if (i == count) - array_append(&keyword_list, &idx, 1); + array_push_back(&keyword_list, &idx); } /* once we know how many keywords there are, we can allocate the array diff --git a/src/lib-storage/index/mbox/mbox-sync.c b/src/lib-storage/index/mbox/mbox-sync.c index e14624358d..91eba5f122 100644 --- a/src/lib-storage/index/mbox/mbox-sync.c +++ b/src/lib-storage/index/mbox/mbox-sync.c @@ -755,7 +755,7 @@ mbox_sync_handle_missing_space(struct mbox_sync_mail_context *mail_ctx) array_append_array(&keywords_copy, &mail_ctx->mail.keywords); mail_ctx->mail.keywords = keywords_copy; } - array_append(&sync_ctx->mails, &mail_ctx->mail, 1); + array_push_back(&sync_ctx->mails, &mail_ctx->mail); sync_ctx->space_diff += mail_ctx->mail.space; if (sync_ctx->space_diff < 0) { diff --git a/src/lib-storage/index/pop3c/pop3c-sync.c b/src/lib-storage/index/pop3c/pop3c-sync.c index 8fc95cead4..3dd466ec95 100644 --- a/src/lib-storage/index/pop3c/pop3c-sync.c +++ b/src/lib-storage/index/pop3c/pop3c-sync.c @@ -61,7 +61,7 @@ int pop3c_sync_get_uidls(struct pop3c_mailbox *mbox) } cline = p_strdup(mbox->uidl_pool, p); - array_append(&uidls, &cline, 1); + array_push_back(&uidls, &cline); } i_stream_destroy(&input); if (line != NULL) { diff --git a/src/lib-storage/list/mailbox-list-fs-iter.c b/src/lib-storage/list/mailbox-list-fs-iter.c index 098df35e59..7cf2b5dde6 100644 --- a/src/lib-storage/list/mailbox-list-fs-iter.c +++ b/src/lib-storage/list/mailbox-list-fs-iter.c @@ -386,7 +386,7 @@ fs_list_get_valid_patterns(struct fs_list_iterate_context *ctx, if (mailbox_list_is_valid_name(_list, test_pattern, &error) && mailbox_list_is_valid_name(_list, real_pattern, &error)) { pattern = p_strdup(ctx->ctx.pool, *patterns); - array_append(&valid_patterns, &pattern, 1); + array_push_back(&valid_patterns, &pattern); } } array_append_zero(&valid_patterns); /* NULL-terminate */ diff --git a/src/lib-storage/list/mailbox-list-index-sync.c b/src/lib-storage/list/mailbox-list-index-sync.c index 700d18ac0f..66872904cb 100644 --- a/src/lib-storage/list/mailbox-list-index-sync.c +++ b/src/lib-storage/list/mailbox-list-index-sync.c @@ -140,7 +140,7 @@ get_existing_name_ids(ARRAY_TYPE(uint32_t) *ids, for (; node != NULL; node = node->next) { if (node->children != NULL) get_existing_name_ids(ids, node->children); - array_append(ids, &node->name_id, 1); + array_push_back(ids, &node->name_id); } } diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c index 437521a5e6..ff0570ea4b 100644 --- a/src/lib-storage/list/mailbox-list-maildir.c +++ b/src/lib-storage/list/mailbox-list-maildir.c @@ -348,7 +348,7 @@ maildir_rename_children(struct mailbox_list *oldlist, const char *oldname, if (strncmp(info->vname, old_vname, old_vnamelen) == 0 && info->vname[old_vnamelen] == old_ns_sep) { name = p_strdup(pool, info->vname + old_vnamelen); - array_append(&names_arr, &name, 1); + array_push_back(&names_arr, &name); } } if (mailbox_list_iter_deinit(&iter) < 0) { diff --git a/src/lib-storage/mail-search-register-human.c b/src/lib-storage/mail-search-register-human.c index 346e16377a..2ff0a6ae03 100644 --- a/src/lib-storage/mail-search-register-human.c +++ b/src/lib-storage/mail-search-register-human.c @@ -193,7 +193,7 @@ mail_search_register_init_human(struct mail_search_register *imap_register) for (i = j = 0; i < imap_count && j < human_count; ) { ret = strcmp(imap_args[i].key, human_args[j].key); if (ret < 0) { - array_append(©_args, &imap_args[i], 1); + array_push_back(©_args, &imap_args[i]); i++; } else if (ret > 0) { j++; @@ -202,7 +202,7 @@ mail_search_register_init_human(struct mail_search_register *imap_register) } } for (; i < imap_count; i++) - array_append(©_args, &imap_args[i], 1); + array_push_back(©_args, &imap_args[i]); imap_args = array_get(©_args, &imap_count); mail_search_register_add(reg, imap_args, imap_count); diff --git a/src/lib-storage/mail-storage-hooks.c b/src/lib-storage/mail-storage-hooks.c index de35b3af5a..88214b2e7c 100644 --- a/src/lib-storage/mail-storage-hooks.c +++ b/src/lib-storage/mail-storage-hooks.c @@ -140,7 +140,7 @@ static void mail_user_add_plugin_hooks(struct mail_user *user) if (!str_array_find(plugins, name)) continue; } - array_append(&tmp_hooks, module_hook, 1); + array_push_back(&tmp_hooks, module_hook); } /* next we have to sort them by the modules' priority (based on name) */ @@ -150,7 +150,7 @@ static void mail_user_add_plugin_hooks(struct mail_user *user) p_array_init(&user->hooks, user->pool, array_count(&tmp_hooks) + array_count(&internal_hooks)); array_foreach(&tmp_hooks, module_hook) - array_append(&user->hooks, &module_hook->hooks, 1); + array_push_back(&user->hooks, &module_hook->hooks); array_append_array(&user->hooks, &internal_hooks); } diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index 815ef3d03a..fac8b133a4 100644 --- a/src/lib-storage/mail-storage-settings.c +++ b/src/lib-storage/mail-storage-settings.c @@ -551,7 +551,7 @@ static bool mail_storage_settings_check(void *_set, pool_t pool, set->parsed_mail_attachment_exclude_inlined = TRUE; } else if (str_begins(opt, "content-type=")) { const char *value = p_strdup(pool, opt+13); - array_append(&content_types, &value, 1); + array_push_back(&content_types, &value); } else { *error_r = t_strdup_printf("mail_attachment_detection_options: " "Unknown option: %s", opt); diff --git a/src/lib-storage/mailbox-attribute.c b/src/lib-storage/mailbox-attribute.c index 04bbbee750..b3bd583134 100644 --- a/src/lib-storage/mailbox-attribute.c +++ b/src/lib-storage/mailbox-attribute.c @@ -167,7 +167,7 @@ mailbox_internal_attributes_get(enum mail_attribute_type type, } } if (have_dict || regs[i].rank == MAIL_ATTRIBUTE_INTERNAL_RANK_AUTHORITY) - array_append(attrs, &key, 1); + array_push_back(attrs, &key); } } @@ -407,7 +407,7 @@ mailbox_attribute_iter_init(struct mailbox *box, strncmp(*attr, MAILBOX_ATTRIBUTE_PREFIX_DOVECOT_PVT_SERVER, strlen(MAILBOX_ATTRIBUTE_PREFIX_DOVECOT_PVT_SERVER)) == 0) continue; - array_append(&intiter->extra_attrs, attr, 1); + array_push_back(&intiter->extra_attrs, attr); } return &intiter->iter; } diff --git a/src/lib-storage/mailbox-keywords.c b/src/lib-storage/mailbox-keywords.c index 6e9034d41e..dce4ae4dac 100644 --- a/src/lib-storage/mailbox-keywords.c +++ b/src/lib-storage/mailbox-keywords.c @@ -17,7 +17,7 @@ mailbox_keywords_create_skip(struct mailbox *box, t_array_init(&valid_keywords, 32); for (; *keywords != NULL; keywords++) { if (mailbox_keyword_is_valid(box, *keywords, &error)) - array_append(&valid_keywords, keywords, 1); + array_push_back(&valid_keywords, keywords); } array_append_zero(&valid_keywords); /* NULL-terminate */ kw = mail_index_keywords_create(box->index, keywords); diff --git a/src/lib-storage/mailbox-tree.c b/src/lib-storage/mailbox-tree.c index 4ce4a47548..8f86833a6e 100644 --- a/src/lib-storage/mailbox-tree.c +++ b/src/lib-storage/mailbox-tree.c @@ -314,7 +314,7 @@ static void mailbox_tree_sort_branch(struct mailbox_node **nodes, /* first put the nodes into an array and sort it */ array_clear(tmparr); for (node = *nodes; node != NULL; node = node->next) - array_append(tmparr, &node, 1); + array_push_back(tmparr, &node); array_sort(tmparr, mailbox_node_name_cmp); /* update the node pointers */ diff --git a/src/lib-storage/mailbox-watch.c b/src/lib-storage/mailbox-watch.c index 5b12abf33d..07f7762444 100644 --- a/src/lib-storage/mailbox-watch.c +++ b/src/lib-storage/mailbox-watch.c @@ -122,7 +122,7 @@ int mailbox_watch_extract_notify_fd(struct mailbox *box, const char **reason_r) for (file = box->notify_files; file != NULL && !failed; file = file->next) { switch (io_add_notify(file->path, notify_extract_callback, box, &io)) { case IO_NOTIFY_ADDED: - array_append(&temp_ios, &io, 1); + array_push_back(&temp_ios, &io); break; case IO_NOTIFY_NOTFOUND: *reason_r = t_strdup_printf( diff --git a/src/lib/env-util.c b/src/lib/env-util.c index 3352d1f359..6ac09d35bd 100644 --- a/src/lib/env-util.c +++ b/src/lib/env-util.c @@ -86,7 +86,7 @@ static void env_clean_except_real(const char *const preserve_envs[]) value = getenv(key); if (value != NULL) { value = t_strconcat(key, "=", value, NULL); - array_append(©, &value, 1); + array_push_back(©, &value); } } diff --git a/src/lib/event-filter.c b/src/lib/event-filter.c index 2141e24345..02e4497fc6 100644 --- a/src/lib/event-filter.c +++ b/src/lib/event-filter.c @@ -230,14 +230,14 @@ void event_filter_merge(struct event_filter *dest, t_array_init(&categories, int_query->categories_count); for (i = 0; i < int_query->categories_count; i++) { - array_append(&categories, - &int_query->categories[i].name, 1); + array_push_back(&categories, + &int_query->categories[i].name); } for (i = 0; i < N_ELEMENTS(event_filter_log_type_names); i++) { if ((int_query->log_type_mask & (1 << i)) == 0) continue; - array_append(&categories, - &event_filter_log_type_names[i], 1); + array_push_back(&categories, + &event_filter_log_type_names[i]); } array_append_zero(&categories); query.categories = array_first(&categories); @@ -375,7 +375,7 @@ bool event_filter_import_unescaped(struct event_filter *filter, } break; case EVENT_FILTER_CODE_CATEGORY: - array_append(&categories, &arg, 1); + array_push_back(&categories, &arg); break; case EVENT_FILTER_CODE_FIELD: { struct event_filter_field *field; diff --git a/src/lib/lib-event.c b/src/lib/lib-event.c index ab97a97193..8f75e0ce05 100644 --- a/src/lib/lib-event.c +++ b/src/lib/lib-event.c @@ -381,7 +381,7 @@ static void event_category_register(struct event_category *category) Event filtering uses pointer comparisons for efficiency. */ i_assert(event_category_find_registered(category->name) == NULL); category->registered = TRUE; - array_append(&event_registered_categories, &category, 1); + array_push_back(&event_registered_categories, &category); array_foreach(&event_category_callbacks, callbackp) T_BEGIN { (*callbackp)(category); diff --git a/src/lib/module-dir.c b/src/lib/module-dir.c index e26025971c..5de0dedfab 100644 --- a/src/lib/module-dir.c +++ b/src/lib/module-dir.c @@ -431,7 +431,7 @@ module_dir_load_real(struct module **_modules, } T_END; name = p_strdup(pool, d->d_name); - array_append(&names, &name, 1); + array_push_back(&names, &name); } if (errno != 0) *error_r = i_strdup_printf("readdir(%s) failed: %m", dir); diff --git a/src/lib/seq-range-array.c b/src/lib/seq-range-array.c index 336f99a886..6d818001c7 100644 --- a/src/lib/seq-range-array.c +++ b/src/lib/seq-range-array.c @@ -44,7 +44,7 @@ bool seq_range_array_add(ARRAY_TYPE(seq_range) *array, uint32_t seq) data = array_get_modifiable(array, &count); if (count == 0) { - array_append(array, &value, 1); + array_push_back(array, &value); return FALSE; } @@ -54,7 +54,7 @@ bool seq_range_array_add(ARRAY_TYPE(seq_range) *array, uint32_t seq) /* grow last range */ data[count-1].seq2 = seq; } else { - array_append(array, &value, 1); + array_push_back(array, &value); } return FALSE; } @@ -441,7 +441,7 @@ void seq_range_array_invert(ARRAY_TYPE(seq_range) *array, i_array_init(array, 4); value.seq1 = min_seq; value.seq2 = max_seq; - array_append(array, &value, 1); + array_push_back(array, &value); return; } i_assert(range[0].seq1 >= min_seq); @@ -477,7 +477,7 @@ void seq_range_array_invert(ARRAY_TYPE(seq_range) *array, if (min_seq <= max_seq) { value.seq1 = min_seq; value.seq2 = max_seq; - array_append(array, &value, 1); + array_push_back(array, &value); } } diff --git a/src/lib/test-array.c b/src/lib/test-array.c index 4172eac198..43ed5fcfab 100644 --- a/src/lib/test-array.c +++ b/src/lib/test-array.c @@ -20,7 +20,7 @@ static void test_array_count(void) test_assert(array_is_empty(&foos)); test_assert(!array_not_empty(&foos)); nfoo.a = nfoo.b = nfoo.c = 9; - array_append(&foos, &nfoo, 1); + array_push_back(&foos, &nfoo); test_assert(array_count(&foos) == 1); test_assert(!array_is_empty(&foos)); test_assert(array_not_empty(&foos)); @@ -38,7 +38,7 @@ static void test_array_foreach(void) t_array_init(&foos, 32); for (i = 0; i < 10; i++) { nfoo.a = nfoo.b = nfoo.c = i; - array_append(&foos, &nfoo, 1); + array_push_back(&foos, &nfoo); } array_foreach(&foos, foo) { @@ -59,7 +59,7 @@ static void test_array_foreach_elem_struct(void) t_array_init(&foos, 32); for (i = 0; i < 10; i++) { foo.a = foo.b = foo.c = i; - array_append(&foos, &foo, 1); + array_push_back(&foos, &foo); } i = 0; @@ -85,8 +85,8 @@ static void test_array_foreach_elem_string(void) for (i = 0; i < 10; i++) { cstring = t_strdup_printf("x%iy", i); string = (char *)cstring; - array_append(&blurbs, &string, 1); - array_append(&cblurbs, &cstring, 1); + array_push_back(&blurbs, &string); + array_push_back(&cblurbs, &cstring); } i = 0; @@ -113,7 +113,7 @@ static void test_array_swap(void) t_array_init(&foos[i-1], i); for (j = 1; j <= 2*i+1; j++) { nfoo.a = nfoo.b = nfoo.c = j; - array_append(&foos[i-1], &nfoo, 1); + array_push_back(&foos[i - 1], &nfoo); } } for (i = 0; i < 1000; i++) @@ -192,7 +192,7 @@ static void test_array_cmp(void) t_array_init(&arr2, NELEMS); for (i = 0; i < NELEMS; i++) { elems[i] = i_rand(); - array_append(&arr2, &elems[i], 1); + array_push_back(&arr2, &elems[i]); } array_append(&arr1, elems, NELEMS); test_assert(array_cmp(&arr1, &arr2) == TRUE); @@ -224,7 +224,7 @@ static void test_array_cmp(void) test_assert_idx(array_equal_fn_ctx(&arr1, &arr2, test_compare_ushort_fuzz, &fuzz) == TRUE, i); } elems[NELEMS] = 0; - array_append(&arr2, &elems[NELEMS], 1); + array_push_back(&arr2, &elems[NELEMS]); test_assert(array_cmp(&arr1, &arr2) == FALSE); test_assert(array_equal_fn(&arr1, &arr2, test_compare_ushort) == FALSE); test_assert_idx(array_equal_fn_ctx(&arr1, &arr2, test_compare_ushort_fuzz, &fuzz) == FALSE, i); @@ -248,7 +248,7 @@ static void test_array_cmp_str(void) t_array_init(&arr2, NELEMS); for (i = 0; i < NELEMS; i++) { elemstrs[i] = t_strdup_printf("%x", i_rand()); /* never 0-length */ - array_append(&arr2, &elemstrs[i], 1); + array_push_back(&arr2, &elemstrs[i]); } array_append(&arr1, elemstrs, NELEMS); test_assert(array_cmp(&arr1, &arr2) == TRUE); /* pointers shared, so identical */ diff --git a/src/lib/unichar.c b/src/lib/unichar.c index 29489a2014..89d50151c9 100644 --- a/src/lib/unichar.c +++ b/src/lib/unichar.c @@ -120,7 +120,7 @@ int uni_utf8_to_ucs4(const char *input, ARRAY_TYPE(unichars) *output) } input += len; - array_append(output, &chr, 1); + array_push_back(output, &chr); } return 0; } @@ -136,7 +136,7 @@ int uni_utf8_to_ucs4_n(const unsigned char *input, size_t size, return -1; /* invalid input */ input += len; size -= len; - array_append(output, &chr, 1); + array_push_back(output, &chr); } return 0; } diff --git a/src/lib/uri-util.c b/src/lib/uri-util.c index 4da0e47be9..67adae8506 100644 --- a/src/lib/uri-util.c +++ b/src/lib/uri-util.c @@ -928,7 +928,7 @@ int uri_parse_path(struct uri_parser *parser, if (segment != NULL) { if (path_r != NULL) - array_append(&segments, &segment, 1); + array_push_back(&segments, &segment); count++; } @@ -955,7 +955,7 @@ int uri_parse_path(struct uri_parser *parser, /* special treatment for a trailing '..' or '.' */ if (segment == NULL) { segment = ""; - array_append(&segments, &segment, 1); + array_push_back(&segments, &segment); } array_append_zero(&segments); *path_r = array_get(&segments, &count); diff --git a/src/lib/var-expand-if.c b/src/lib/var-expand-if.c index 79d72869b4..6b784f4103 100644 --- a/src/lib/var-expand-if.c +++ b/src/lib/var-expand-if.c @@ -212,7 +212,7 @@ int var_expand_if(struct var_expand_context *ctx, depth--; } else if (depth == 0 && *par_end == ';') { const char *par = str_c(parbuf); - array_append(¶ms, &par, 1); + array_push_back(¶ms, &par); parbuf = t_str_new(64); continue; /* if there is a unescaped : at top level it means @@ -227,13 +227,13 @@ int var_expand_if(struct var_expand_context *ctx, if (str_len(parbuf) > 0) { const char *par = str_c(parbuf); - array_append(¶ms, &par, 1); + array_push_back(¶ms, &par); } if (array_count(¶ms) != 5) { if (array_count(¶ms) == 4) { const char *empty = ""; - array_append(¶ms, &empty, 1); + array_push_back(¶ms, &empty); } else { *error_r = t_strdup_printf("if: requires four or five parameters, got %u", array_count(¶ms)); @@ -254,7 +254,7 @@ int var_expand_if(struct var_expand_context *ctx, return ret; } const char *p = str_c(param); - array_append(¶ms, &p, 1); + array_push_back(¶ms, &p); } i_assert(array_count(¶ms) == 5); diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c index 2f04f200fc..81a5725ebc 100644 --- a/src/login-common/client-common-auth.c +++ b/src/login-common/client-common-auth.c @@ -111,7 +111,7 @@ static void alt_username_set(ARRAY_TYPE(const_string) *alt_usernames, pool_t poo } if (i == count) { char *new_key = i_strdup(key); - array_append(&global_alt_usernames, &new_key, 1); + array_push_back(&global_alt_usernames, &new_key); } value = p_strdup(pool, value); @@ -124,9 +124,9 @@ static void alt_username_set(ARRAY_TYPE(const_string) *alt_usernames, pool_t poo the middle set them as "" */ while (array_count(alt_usernames) < i) { const char *empty_str = ""; - array_append(alt_usernames, &empty_str, 1); + array_push_back(alt_usernames, &empty_str); } - array_append(alt_usernames, &value, 1); + array_push_back(alt_usernames, &value); } static void client_auth_parse_args(struct client *client, bool success, diff --git a/src/login-common/main.c b/src/login-common/main.c index e493195f19..a0447e2215 100644 --- a/src/login-common/main.c +++ b/src/login-common/main.c @@ -343,7 +343,7 @@ parse_login_source_ips(const char *ips_str, unsigned int *count_r) for (i = 0; i < tmp_ips_count; i++) { if (skip_nonworking && net_try_bind(&tmp_ips[i]) < 0) continue; - array_append(&ips, &tmp_ips[i], 1); + array_push_back(&ips, &tmp_ips[i]); } } return array_get(&ips, count_r); diff --git a/src/master/dup2-array.c b/src/master/dup2-array.c index 984d161173..062590a707 100644 --- a/src/master/dup2-array.c +++ b/src/master/dup2-array.c @@ -15,7 +15,7 @@ void dup2_append(ARRAY_TYPE(dup2) *dups, int fd_src, int fd_dest) d.fd_src = fd_src; d.fd_dest = fd_dest; - array_append(dups, &d, 1); + array_push_back(dups, &d); } int dup2_array(ARRAY_TYPE(dup2) *dups_arr) diff --git a/src/master/master-settings.c b/src/master/master-settings.c index ab62602edf..da37a013e2 100644 --- a/src/master/master-settings.c +++ b/src/master/master-settings.c @@ -307,7 +307,7 @@ fix_file_listener_paths(ARRAY_TYPE(file_listener_settings) *l, "unix_listener: %s", set->path); } if (set->mode != 0) - array_append(all_listeners, &set->path, 1); + array_push_back(all_listeners, &set->path); } return TRUE; } @@ -326,7 +326,7 @@ static void add_inet_listeners(ARRAY_TYPE(inet_listener_settings) *l, if (set->port != 0) { str = t_strdup_printf("%u:%s", set->port, set->address); - array_append(all_listeners, &str, 1); + array_push_back(all_listeners, &str); } } } diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c index 2fed3f11c4..14ac460b14 100644 --- a/src/master/service-monitor.c +++ b/src/master/service-monitor.c @@ -489,7 +489,7 @@ void services_monitor_start(struct service_list *service_list) service_status_input, service); } service_monitor_listen_start(service); - array_append(&listener_services, &service, 1); + array_push_back(&listener_services, &service); } /* create processes only after adding all listeners */ diff --git a/src/plugins/acl/acl-api.c b/src/plugins/acl/acl-api.c index c82599b1e4..e9fcb60aa1 100644 --- a/src/plugins/acl/acl-api.c +++ b/src/plugins/acl/acl-api.c @@ -349,9 +349,9 @@ int acl_rights_update_import(struct acl_rights_update *update, if (*right == ':') { /* non-standard right */ right++; - array_append(dest, &right, 1); + array_push_back(dest, &right); } else if (is_standard_right(right)) { - array_append(dest, &right, 1); + array_push_back(dest, &right); } else { *error_r = t_strdup_printf("Invalid right '%s'", right); @@ -359,7 +359,7 @@ int acl_rights_update_import(struct acl_rights_update *update, } } else { for (j = 0; all_mailbox_rights[j] != NULL; j++) - array_append(dest, &all_mailbox_rights[j], 1); + array_push_back(dest, &all_mailbox_rights[j]); } } if (array_count(&dest_rights) > 0) { @@ -591,7 +591,7 @@ acl_right_names_parse(pool_t pool, const char *acl, const char **error_r) return NULL; } - array_append(&rights, &acl_letter_map[i].name, 1); + array_push_back(&rights, &acl_letter_map[i].name); acl++; } while (*acl == ' ' || *acl == '\t') acl++; @@ -606,7 +606,7 @@ acl_right_names_parse(pool_t pool, const char *acl, const char **error_r) names = t_strsplit_spaces(acl + 1, ", \t"); for (; *names != NULL; names++) { const char *name = p_strdup(pool, *names); - array_append(&rights, &name, 1); + array_push_back(&rights, &name); } } @@ -652,11 +652,11 @@ void acl_right_names_merge(pool_t pool, const char *const **destp, t_array_init(&rights, 64); if (dest != NULL) { for (i = 0; dest[i] != NULL; i++) - array_append(&rights, &dest[i], 1); + array_push_back(&rights, &dest[i]); } if (src != NULL) { for (i = 0; src[i] != NULL; i++) - array_append(&rights, &src[i], 1); + array_push_back(&rights, &src[i]); } *destp = acl_right_names_alloc(pool, &rights, dup_strings); @@ -691,7 +691,7 @@ bool acl_right_names_modify(pool_t pool, break; } if (modify_rights[j] == NULL) - array_append(&rights, &old_rights[i], 1); + array_push_back(&rights, &old_rights[i]); } new_rights = &null; modify_rights = array_count(&rights) == 0 ? NULL : diff --git a/src/plugins/acl/acl-backend-vfile-acllist.c b/src/plugins/acl/acl-backend-vfile-acllist.c index 0dba5fe953..ff5b99d24f 100644 --- a/src/plugins/acl/acl-backend-vfile-acllist.c +++ b/src/plugins/acl/acl-backend-vfile-acllist.c @@ -198,7 +198,7 @@ acllist_append(struct acl_backend_vfile *backend, struct ostream *output, if (ret > 0) { acllist.name = p_strdup(backend->acllist_pool, name); - array_append(&backend->acllist, &acllist, 1); + array_push_back(&backend->acllist, &acllist); T_BEGIN { const char *line; diff --git a/src/plugins/acl/acl-backend-vfile.c b/src/plugins/acl/acl-backend-vfile.c index c1fe2b6078..3406752edc 100644 --- a/src/plugins/acl/acl-backend-vfile.c +++ b/src/plugins/acl/acl-backend-vfile.c @@ -381,7 +381,7 @@ acl_backend_vfile_read(struct acl_object *aclobj, bool global, const char *path, i_error("ACL file %s line %u: %s", path, linenum, error); } else { - array_append(&aclobj->rights, &rights, 1); + array_push_back(&aclobj->rights, &rights); } } T_END; if (ret < 0) diff --git a/src/plugins/acl/acl-global-file.c b/src/plugins/acl/acl-global-file.c index 8fa4041563..4d4b1a6003 100644 --- a/src/plugins/acl/acl-global-file.c +++ b/src/plugins/acl/acl-global-file.c @@ -173,7 +173,7 @@ static int acl_global_file_read(struct acl_global_file *file) right->vpattern = pright->vpattern; p_array_init(&right->rights, file->rights_pool, 4); } - array_append(&right->rights, &pright->rights, 1); + array_push_back(&right->rights, &pright->rights); } array_free(&ctx.parse_rights); diff --git a/src/plugins/acl/acl-lookup-dict.c b/src/plugins/acl/acl-lookup-dict.c index 3f88a7b893..d9a2ae954b 100644 --- a/src/plugins/acl/acl-lookup-dict.c +++ b/src/plugins/acl/acl-lookup-dict.c @@ -134,7 +134,7 @@ static int acl_lookup_dict_rebuild_add_backend(struct mail_namespace *ns, str_append_c(id, '/'); str_append(id, ns->owner->username); id_dup = t_strdup(str_c(id)); - array_append(ids, &id_dup, 1); + array_push_back(ids, &id_dup); } } if (acl_object_list_deinit(&iter) < 0) ret = -1; @@ -175,7 +175,7 @@ acl_lookup_dict_rebuild_update(struct acl_lookup_dict *dict, p = strrchr(key, '/'); if (p != NULL && strcmp(p + 1, username) == 0) { key = t_strdup_until(key, p); - array_append(&old_ids_arr, &key, 1); + array_push_back(&old_ids_arr, &key); } } if (dict_iterate_deinit(&iter, &error) < 0) { diff --git a/src/plugins/apparmor/apparmor-plugin.c b/src/plugins/apparmor/apparmor-plugin.c index 3ba26c432d..94490e1af7 100644 --- a/src/plugins/apparmor/apparmor-plugin.c +++ b/src/plugins/apparmor/apparmor-plugin.c @@ -68,12 +68,12 @@ static void apparmor_mail_user_created(struct mail_user *user) return; t_array_init(&hats, 8); - array_append(&hats, &hat, 1); + array_push_back(&hats, &hat); for(unsigned int i = 2;; i++) { hat = mail_user_plugin_getenv(user, t_strdup_printf("%s%u", APPARMOR_PLUGIN_SETTING_HAT_PREFIX, i)); if (hat == NULL) break; - array_append(&hats, &hat, 1); + array_push_back(&hats, &hat); } array_append_zero(&hats); diff --git a/src/plugins/expire/doveadm-expire.c b/src/plugins/expire/doveadm-expire.c index a577dc491c..c18320ed2c 100644 --- a/src/plugins/expire/doveadm-expire.c +++ b/src/plugins/expire/doveadm-expire.c @@ -177,7 +177,7 @@ static const char *const *doveadm_expire_get_patterns(void) t_array_init(&patterns, 16); str = doveadm_plugin_getenv("expire"); for (i = 2; str != NULL; i++) { - array_append(&patterns, &str, 1); + array_push_back(&patterns, &str); if (i_snprintf(set_name, sizeof(set_name), "expire%u", i) < 0) i_unreached(); diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c index 39a194961e..271f4650c5 100644 --- a/src/plugins/expire/expire-plugin.c +++ b/src/plugins/expire/expire-plugin.c @@ -388,7 +388,7 @@ static const char *const *expire_get_patterns(struct mail_user *user) t_array_init(&patterns, 16); str = mail_user_set_plugin_getenv(user->set, "expire"); for (i = 2; str != NULL; i++) { - array_append(&patterns, &str, 1); + array_push_back(&patterns, &str); if (i_snprintf(set_name, sizeof(set_name), "expire%u", i) < 0) i_unreached(); diff --git a/src/plugins/fts-squat/squat-trie.c b/src/plugins/fts-squat/squat-trie.c index f77a8ea986..3a33c9e7b3 100644 --- a/src/plugins/fts-squat/squat-trie.c +++ b/src/plugins/fts-squat/squat-trie.c @@ -1139,7 +1139,7 @@ squat_trie_iterate_next(struct squat_trie_iterate_context *ctx, return squat_trie_iterate_next(ctx, shifts_r); } } - array_append(&ctx->parents, &ctx->cur, 1); + array_push_back(&ctx->parents, &ctx->cur); ctx->cur.node = &children[ctx->cur.idx-1]; ctx->cur.idx = 0; if (shift_count != 0) @@ -1865,12 +1865,12 @@ squat_trie_filter_type(enum squat_index_type type, if (next_seq == new_range.seq2 + 1) { /* we can continue the previous range */ } else { - array_append(dest, &new_range, 1); + array_push_back(dest, &new_range); new_range.seq1 = src_range[i].seq1 / 2; } new_range.seq2 = src_range[i].seq2 / 2; } - array_append(dest, &new_range, 1); + array_push_back(dest, &new_range); return; } @@ -1951,7 +1951,7 @@ static void squat_trie_add_unknown(struct squat_trie *trie, } else { new_range.seq1 = last_uid + 1; new_range.seq2 = (uint32_t)-1; - array_append(maybe_uids, &new_range, 1); + array_push_back(maybe_uids, &new_range); } } diff --git a/src/plugins/fts-squat/squat-uidlist.c b/src/plugins/fts-squat/squat-uidlist.c index 16eb04320d..8844ab2d38 100644 --- a/src/plugins/fts-squat/squat-uidlist.c +++ b/src/plugins/fts-squat/squat-uidlist.c @@ -1022,11 +1022,11 @@ uint32_t squat_uidlist_rebuild_nextu(struct squat_uidlist_rebuild_context *ctx, i_array_init(&tmp_uids, 128); for (i = 0; i < count; i++) { if (range[i].seq1 == range[i].seq2) - array_append(&tmp_uids, &range[i].seq1, 1); + array_push_back(&tmp_uids, &range[i].seq1); else { uid1 = range[i].seq1 | UID_LIST_MASK_RANGE; - array_append(&tmp_uids, &uid1, 1); - array_append(&tmp_uids, &range[i].seq2, 1); + array_push_back(&tmp_uids, &uid1); + array_push_back(&tmp_uids, &range[i].seq2); } } ret = squat_uidlist_rebuild_next(ctx, &tmp_uids); @@ -1241,7 +1241,7 @@ static void uidlist_array_append(ARRAY_TYPE(uint32_t) *uids, uint32_t uid) uidlist = array_get_modifiable(uids, &count); if (count == 0) { - array_append(uids, &uid, 1); + array_push_back(uids, &uid); return; } if (uidlist[count-1] + 1 == uid) { @@ -1252,7 +1252,7 @@ static void uidlist_array_append(ARRAY_TYPE(uint32_t) *uids, uint32_t uid) } uidlist[count-1] |= UID_LIST_MASK_RANGE; } - array_append(uids, &uid, 1); + array_push_back(uids, &uid); } static void uidlist_array_append_range(ARRAY_TYPE(uint32_t) *uids, @@ -1266,8 +1266,8 @@ static void uidlist_array_append_range(ARRAY_TYPE(uint32_t) *uids, uidlist = array_get_modifiable(uids, &count); if (count == 0) { uid1 |= UID_LIST_MASK_RANGE; - array_append(uids, &uid1, 1); - array_append(uids, &uid2, 1); + array_push_back(uids, &uid1); + array_push_back(uids, &uid2); return; } if (uidlist[count-1] + 1 == uid1) { @@ -1279,9 +1279,9 @@ static void uidlist_array_append_range(ARRAY_TYPE(uint32_t) *uids, uidlist[count-1] |= UID_LIST_MASK_RANGE; } else { uid1 |= UID_LIST_MASK_RANGE; - array_append(uids, &uid1, 1); + array_push_back(uids, &uid1); } - array_append(uids, &uid2, 1); + array_push_back(uids, &uid2); } static int @@ -1516,7 +1516,7 @@ int squat_uidlist_get_seqrange(struct squat_uidlist *uidlist, range.seq1 = tmp_uids[i] & ~UID_LIST_MASK_RANGE; range.seq2 = tmp_uids[++i]; } - array_append(seq_range_arr, &range, 1); + array_push_back(seq_range_arr, &range); } } array_free(&tmp_uid_arr); diff --git a/src/plugins/fts/fts-api.c b/src/plugins/fts/fts-api.c index b5064d1e27..730fe36532 100644 --- a/src/plugins/fts/fts-api.c +++ b/src/plugins/fts/fts-api.c @@ -267,7 +267,7 @@ fts_merge_maybies(ARRAY_TYPE(seq_range) *dest_maybe, /* create unwanted sequences list from both sources */ t_array_init(&src_unwanted, 128); new_range.seq1 = 0; new_range.seq2 = (uint32_t)-1; - array_append(&src_unwanted, &new_range, 1); + array_push_back(&src_unwanted, &new_range); seq_range_array_remove_seq_range(&src_unwanted, src_maybe); seq_range_array_remove_seq_range(&src_unwanted, src_definite); diff --git a/src/plugins/fts/fts-search-args.c b/src/plugins/fts/fts-search-args.c index 3d7b68d8bc..651f863133 100644 --- a/src/plugins/fts/fts-search-args.c +++ b/src/plugins/fts/fts-search-args.c @@ -67,9 +67,9 @@ fts_backend_dovecot_expand_tokens(struct fts_filter *filter, t_array_init(&tokens, 4); /* first add the word exactly as it without any tokenization */ - array_append(&tokens, &orig_token, 1); + array_push_back(&tokens, &orig_token); /* then add it tokenized, but without filtering */ - array_append(&tokens, &token, 1); + array_push_back(&tokens, &token); /* add the word filtered */ if (filter != NULL) { @@ -77,7 +77,7 @@ fts_backend_dovecot_expand_tokens(struct fts_filter *filter, ret = fts_filter_filter(filter, &token2, &error); if (ret > 0) { token2 = t_strdup(token2); - array_append(&tokens, &token2, 1); + array_push_back(&tokens, &token2); } else if (ret < 0) { *error_r = t_strdup_printf("Couldn't filter search token: %s", error); return -1; diff --git a/src/plugins/fts/fts-search.c b/src/plugins/fts/fts-search.c index 91d3ca7ed1..49ac00d311 100644 --- a/src/plugins/fts/fts-search.c +++ b/src/plugins/fts/fts-search.c @@ -177,13 +177,13 @@ static int fts_search_lookup_level_multi(struct fts_search_context *fctx, t_array_init(&tmp_mailboxes, mailbox_count); for (i = 0; i < mailbox_count; i = j) { array_clear(&tmp_mailboxes); - array_append(&tmp_mailboxes, &mailboxes[i], 1); + array_push_back(&tmp_mailboxes, &mailboxes[i]); backend = fts_mailbox_backend(mailboxes[i]); for (j = i + 1; j < mailbox_count; j++) { if (fts_mailbox_backend(mailboxes[j]) != backend) break; - array_append(&tmp_mailboxes, &mailboxes[j], 1); + array_push_back(&tmp_mailboxes, &mailboxes[j]); } array_append_zero(&tmp_mailboxes); @@ -270,18 +270,18 @@ fts_search_merge_scores_or(ARRAY_TYPE(fts_score_map) *dest, for (srci = src2i = 0; srci < src_count || src2i < src2_count;) { if (src2i == src2_count || src_map[srci].uid < src2_map[src2i].uid) { - array_append(dest, &src_map[srci], 1); + array_push_back(dest, &src_map[srci]); srci++; } else if (srci == src_count || src_map[srci].uid > src2_map[src2i].uid) { - array_append(dest, &src2_map[src2i], 1); + array_push_back(dest, &src2_map[src2i]); src2i++; } else { i_assert(src_map[srci].uid == src2_map[src2i].uid); if (src_map[srci].score > src2_map[src2i].score) - array_append(dest, &src_map[srci], 1); + array_push_back(dest, &src_map[srci]); else - array_append(dest, &src2_map[src2i], 1); + array_push_back(dest, &src2_map[src2i]); srci++; src2i++; } } diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c index 4bd11aed71..caf4400194 100644 --- a/src/plugins/fts/fts-storage.c +++ b/src/plugins/fts/fts-storage.c @@ -799,7 +799,7 @@ static const char *const *fts_exclude_get_patterns(struct mail_user *user) t_array_init(&patterns, 16); for (i = 2; str != NULL; i++) { - array_append(&patterns, &str, 1); + array_push_back(&patterns, &str); if (i_snprintf(set_name, sizeof(set_name), "fts_autoindex_exclude%u", i) < 0) diff --git a/src/plugins/fts/fts-user.c b/src/plugins/fts/fts-user.c index 091e119afc..2f12b5aea8 100644 --- a/src/plugins/fts/fts-user.c +++ b/src/plugins/fts/fts-user.c @@ -42,8 +42,8 @@ static const char *const *str_keyvalues_to_array(const char *str) key = keyvalues[i]; value = ""; } - array_append(&arr, &key, 1); - array_append(&arr, &value, 1); + array_push_back(&arr, &key); + array_push_back(&arr, &value); } array_append_zero(&arr); return array_first(&arr); diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c index 41e78e0e1d..c32a3942ba 100644 --- a/src/plugins/imap-acl/imap-acl-plugin.c +++ b/src/plugins/imap-acl/imap-acl-plugin.c @@ -399,8 +399,8 @@ imap_acl_letters_parse(const char *letters, const char *const **rights_r, for (; *letters != '\0'; letters++) { for (i = 0; imap_acl_letter_map[i].name != NULL; i++) { if (imap_acl_letter_map[i].letter == *letters) { - array_append(&rights, - &imap_acl_letter_map[i].name, 1); + array_push_back(&rights, + &imap_acl_letter_map[i].name); break; } } @@ -409,12 +409,12 @@ imap_acl_letters_parse(const char *letters, const char *const **rights_r, rights according to RFC 4314 */ switch (*letters) { case 'c': - array_append(&rights, &acl_k, 1); - array_append(&rights, &acl_x, 1); + array_push_back(&rights, &acl_k); + array_push_back(&rights, &acl_x); break; case 'd': - array_append(&rights, &acl_e, 1); - array_append(&rights, &acl_t, 1); + array_push_back(&rights, &acl_e); + array_push_back(&rights, &acl_t); break; default: *client_error_r = t_strdup_printf( @@ -491,7 +491,7 @@ static void imap_acl_update_ensure_keep_admins(struct acl_backend *backend, for (i = 0; rights[i] != NULL; i++) { if (strcmp(rights[i], MAIL_ACL_ADMIN) == 0) break; - array_append(&new_rights, &rights[i], 1); + array_push_back(&new_rights, &rights[i]); } switch (update->modify_mode) { @@ -502,10 +502,10 @@ static void imap_acl_update_ensure_keep_admins(struct acl_backend *backend, /* adding initial rights for a user. we need to add the defaults also. don't worry about duplicates. */ for (; rights[i] != NULL; i++) - array_append(&new_rights, &rights[i], 1); + array_push_back(&new_rights, &rights[i]); default_rights = acl_object_get_default_rights(aclobj); for (i = 0; default_rights[i] != NULL; i++) - array_append(&new_rights, &default_rights[i], 1); + array_push_back(&new_rights, &default_rights[i]); break; case ACL_MODIFY_MODE_REMOVE: if (rights[i] == NULL) @@ -513,14 +513,14 @@ static void imap_acl_update_ensure_keep_admins(struct acl_backend *backend, /* skip over the ADMIN removal and add the rest */ for (i++; rights[i] != NULL; i++) - array_append(&new_rights, &rights[i], 1); + array_push_back(&new_rights, &rights[i]); break; case ACL_MODIFY_MODE_REPLACE: if (rights[i] != NULL) return; /* add the missing ADMIN right */ - array_append(&new_rights, &acl_admin, 1); + array_push_back(&new_rights, &acl_admin); break; default: return; diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c index e7a83d8bc7..d095daf399 100644 --- a/src/plugins/mail-crypt/doveadm-mail-crypt.c +++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c @@ -145,7 +145,7 @@ mcp_update_shared_key(struct mailbox_transaction_context *t, if (ret == 1) { ARRAY_TYPE(dcrypt_private_key) keys; t_array_init(&keys, 1); - array_append(&keys, &key, 1); + array_push_back(&keys, &key); ret = mail_crypt_box_share_private_keys(t, pkey, dest_username, &keys, error_r); diff --git a/src/plugins/mail-crypt/mail-crypt-key.c b/src/plugins/mail-crypt/mail-crypt-key.c index 5f377e5f3b..60c9c9b3f9 100644 --- a/src/plugins/mail-crypt/mail-crypt-key.c +++ b/src/plugins/mail-crypt/mail-crypt-key.c @@ -1073,7 +1073,7 @@ int mail_crypt_box_get_pvt_digests(struct mailbox *box, pool_t pool, BOX_CRYPT_PREFIX PRIVKEYS_PREFIX); while ((key = mailbox_attribute_iter_next(iter)) != NULL) { key = p_strdup(pool, key); - array_append(digests, &key, 1); + array_push_back(digests, &key); } ret = mailbox_attribute_iter_deinit(&iter); if (ret < 0) @@ -1098,7 +1098,7 @@ int mail_crypt_box_get_private_keys(struct mailbox *box, (void)mailbox_attribute_iter_deinit(&iter); return -1; } else if (ret > 0) - array_append(keys_r, &key, 1); + array_push_back(keys_r, &key); } ret = mailbox_attribute_iter_deinit(&iter); diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c index 2c14717f13..6db5b63070 100644 --- a/src/plugins/quota/quota.c +++ b/src/plugins/quota/quota.c @@ -1168,7 +1168,7 @@ int quota_transaction_commit(struct quota_transaction_context **_ctx) ret = -1; } else if (!ctx->sync_transaction) - array_append(&warn_roots, &roots[i], 1); + array_push_back(&warn_roots, &roots[i]); } /* execute quota warnings after all updates. this makes it work correctly regardless of whether backend.get_resource() diff --git a/src/plugins/virtual/virtual-config.c b/src/plugins/virtual/virtual-config.c index be7bbea3ca..47fc86b389 100644 --- a/src/plugins/virtual/virtual-config.c +++ b/src/plugins/virtual/virtual-config.c @@ -266,7 +266,7 @@ separate_wildcard_mailboxes(struct virtual_mailbox *mbox, } if (dest != NULL) { - array_append(dest, &bboxes[i], 1); + array_push_back(dest, &bboxes[i]); array_delete(&mbox->backend_boxes, i, 1); bboxes = array_get_modifiable(&mbox->backend_boxes, &count); diff --git a/src/plugins/virtual/virtual-save.c b/src/plugins/virtual/virtual-save.c index 9d3f124094..a8f0c86bc5 100644 --- a/src/plugins/virtual/virtual-save.c +++ b/src/plugins/virtual/virtual-save.c @@ -68,7 +68,7 @@ virtual_copy_keywords(struct mailbox *src_box, for (i = 0; i < src_keywords->count; i++) { kwp = array_idx(status.keywords, src_keywords->idx[i]); - array_append(&kw_strings, kwp, 1); + array_push_back(&kw_strings, kwp); } array_append_zero(&kw_strings); return mailbox_keywords_create_valid(dest_box, diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c index 105a49b031..7d6f5c3f05 100644 --- a/src/plugins/virtual/virtual-storage.c +++ b/src/plugins/virtual/virtual-storage.c @@ -819,10 +819,10 @@ virtual_get_virtual_uid_map(struct mailbox *box, if (i == count || uids[i].real_uid > uid) { uint32_t zero = 0; - array_append(virtual_uids_r, &zero, 1); + array_push_back(virtual_uids_r, &zero); } else { i_assert(uids[i].virtual_uid > 0); - array_append(virtual_uids_r, &uids[i].virtual_uid, 1); + array_push_back(virtual_uids_r, &uids[i].virtual_uid); i++; } } @@ -840,7 +840,7 @@ virtual_get_virtual_backend_boxes(struct mailbox *box, bboxes = array_get(&mbox->backend_boxes, &count); for (i = 0; i < count; i++) { if (!only_with_msgs || array_count(&bboxes[i]->uids) > 0) - array_append(mailboxes, &bboxes[i]->box, 1); + array_push_back(mailboxes, &bboxes[i]->box); } } diff --git a/src/plugins/virtual/virtual-sync.c b/src/plugins/virtual/virtual-sync.c index 332cd945ea..c3f7447fae 100644 --- a/src/plugins/virtual/virtual-sync.c +++ b/src/plugins/virtual/virtual-sync.c @@ -638,7 +638,7 @@ virtual_sync_mailbox_box_add(struct virtual_sync_context *ctx, if (ctx->mbox->uids_mapped) { rec.rec.real_uid = add_uid; - array_append(&ctx->all_adds, &rec, 1); + array_push_back(&ctx->all_adds, &rec); } } } diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c index c6d58bb8b8..e607d152e8 100644 --- a/src/pop3/pop3-client.c +++ b/src/pop3/pop3-client.c @@ -134,8 +134,8 @@ msgnum_to_seq_map_add(ARRAY_TYPE(uint32_t) *msgnum_to_seq_map, a POP3 order defined */ seq = array_count(msgnum_to_seq_map) + 1; for (; seq <= msgnum; seq++) - array_append(msgnum_to_seq_map, &seq, 1); - array_append(msgnum_to_seq_map, &mail->seq, 1); + array_push_back(msgnum_to_seq_map, &seq); + array_push_back(msgnum_to_seq_map, &mail->seq); } static int read_mailbox(struct client *client, uint32_t *failed_uid_r) @@ -198,7 +198,7 @@ static int read_mailbox(struct client *client, uint32_t *failed_uid_r) if (client->highest_seq < mail->seq) client->highest_seq = mail->seq; - array_append(&message_sizes, &size, 1); + array_push_back(&message_sizes, &size); msgnum++; } diff --git a/src/replication/replicator/replicator-queue.c b/src/replication/replicator/replicator-queue.c index eeb8dd9245..b8d4812c65 100644 --- a/src/replication/replicator/replicator-queue.c +++ b/src/replication/replicator/replicator-queue.c @@ -294,7 +294,7 @@ replicator_queue_handle_sync_lookups(struct replicator_queue *queue, lookups[i].wait_for_next_push = FALSE; i++; } else { - array_append(&callbacks, &lookups[i], 1); + array_push_back(&callbacks, &lookups[i]); array_delete(&queue->sync_lookups, i, 1); } } diff --git a/src/util/script.c b/src/util/script.c index 56ae49371b..9f0207d383 100644 --- a/src/util/script.c +++ b/src/util/script.c @@ -173,7 +173,7 @@ static bool client_exec_script(struct master_service_connection *conn) envname = t_strdup_until(*args+4, p); if (str_array_find(accepted_envs, envname)) - array_append(&envs, &env, 1); + array_push_back(&envs, &env); args++; } if (strcmp(*args, "noreply") == 0) { @@ -255,7 +255,7 @@ int main(int argc, char *argv[]) case 'e': envs = t_strsplit_spaces(optarg,", \t"); while (*envs != NULL) { - array_append(&aenvs, envs, 1); + array_push_back(&aenvs, envs); envs++; } break; @@ -284,11 +284,11 @@ int main(int argc, char *argv[]) binary = t_strconcat(PKG_LIBEXECDIR"/", argv[0], NULL); i_array_init(&exec_args, argc + 16); - array_append(&exec_args, &binary, 1); + array_push_back(&exec_args, &binary); for (i = 1; i < argc; i++) { const char *arg = argv[i]; - array_append(&exec_args, &arg, 1); + array_push_back(&exec_args, &arg); } master_service_run(master_service, client_connected);