dovecot: Renamed strarray_length/remote() to str_array_length/re...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 16 13:53:25 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/687efa138e77
changeset: 6424:687efa138e77
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 16 13:38:34 2007 +0300
description:
Renamed strarray_length/remote() to str_array_length/remove()
diffstat:
13 files changed, 18 insertions(+), 18 deletions(-)
src/auth/userdb-static.c | 2 +-
src/deliver/deliver.c | 2 +-
src/dict/dict-server.c | 8 ++++----
src/imap/cmd-copy.c | 2 +-
src/lib-imap/imap-match.c | 2 +-
src/lib-index/mail-index-transaction.c | 2 +-
src/lib-storage/index/index-mail-headers.c | 2 +-
src/lib/strfuncs.c | 4 ++--
src/lib/strfuncs.h | 4 ++--
src/plugins/acl/acl-backend.c | 2 +-
src/plugins/acl/acl-cache.c | 2 +-
src/plugins/convert/convert-storage.c | 2 +-
src/plugins/expire/expire-env.c | 2 +-
diffs (198 lines):
diff -r 13b0a3ba5f7b -r 687efa138e77 src/auth/userdb-static.c
--- a/src/auth/userdb-static.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/auth/userdb-static.c Sun Sep 16 13:38:34 2007 +0300
@@ -27,7 +27,7 @@ userdb_static_template_build(pool_t pool
tmpl = p_new(pool, struct userdb_static_template, 1);
tmp = t_strsplit_spaces(args, " ");
- p_array_init(&tmpl->args, pool, strarray_length(tmp));
+ p_array_init(&tmpl->args, pool, str_array_length(tmp));
for (; *tmp != NULL; tmp++) {
value = strchr(*tmp, '=');
diff -r 13b0a3ba5f7b -r 687efa138e77 src/deliver/deliver.c
--- a/src/deliver/deliver.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/deliver/deliver.c Sun Sep 16 13:38:34 2007 +0300
@@ -141,7 +141,7 @@ int deliver_save(struct mail_namespace *
t = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
- kw = strarray_length(keywords) == 0 ? NULL :
+ kw = str_array_length(keywords) == 0 ? NULL :
mailbox_keywords_create_valid(box, keywords);
if (mailbox_copy(t, mail, flags, kw, NULL) < 0)
ret = -1;
diff -r 13b0a3ba5f7b -r 687efa138e77 src/dict/dict-server.c
--- a/src/dict/dict-server.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/dict/dict-server.c Sun Sep 16 13:38:34 2007 +0300
@@ -81,7 +81,7 @@ static int cmd_iterate(struct dict_clien
int ret;
args = t_strsplit(line, "\t");
- if (strarray_length(args) != 2) {
+ if (str_array_length(args) != 2) {
i_error("dict client: ITERATE: broken input");
return -1;
}
@@ -221,7 +221,7 @@ static int cmd_set(struct dict_client_co
/* <id> <key> <value> */
args = t_strsplit(line, "\t");
- if (strarray_length(args) != 3) {
+ if (str_array_length(args) != 3) {
i_error("dict client: SET: broken input");
return -1;
}
@@ -240,7 +240,7 @@ static int cmd_unset(struct dict_client_
/* <id> <key> */
args = t_strsplit(line, "\t");
- if (strarray_length(args) != 2) {
+ if (str_array_length(args) != 2) {
i_error("dict client: UNSET: broken input");
return -1;
}
@@ -260,7 +260,7 @@ static int cmd_atomic_inc(struct dict_cl
/* <id> <key> <diff> */
args = t_strsplit(line, "\t");
- if (strarray_length(args) != 3) {
+ if (str_array_length(args) != 3) {
i_error("dict client: ATOMIC_INC: broken input");
return -1;
}
diff -r 13b0a3ba5f7b -r 687efa138e77 src/imap/cmd-copy.c
--- a/src/imap/cmd-copy.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/imap/cmd-copy.c Sun Sep 16 13:38:34 2007 +0300
@@ -61,7 +61,7 @@ static int fetch_and_copy(struct client
client_send_sendalive_if_needed(client);
keywords_list = mail_get_keywords(mail);
- keywords = strarray_length(keywords_list) == 0 ? NULL :
+ keywords = str_array_length(keywords_list) == 0 ? NULL :
mailbox_keywords_create_valid(destbox, keywords_list);
if (mailbox_copy(t, mail, mail_get_flags(mail),
keywords, NULL) < 0)
diff -r 13b0a3ba5f7b -r 687efa138e77 src/lib-imap/imap-match.c
--- a/src/lib-imap/imap-match.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/lib-imap/imap-match.c Sun Sep 16 13:38:34 2007 +0300
@@ -119,7 +119,7 @@ imap_match_init_multiple(pool_t pool, co
if (!pool->datastack_pool)
t_push();
- patterns_count = strarray_length(patterns);
+ patterns_count = str_array_length(patterns);
match_patterns = p_new(pool, struct imap_match_pattern,
patterns_count + 1);
diff -r 13b0a3ba5f7b -r 687efa138e77 src/lib-index/mail-index-transaction.c
--- a/src/lib-index/mail-index-transaction.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/lib-index/mail-index-transaction.c Sun Sep 16 13:38:34 2007 +0300
@@ -1137,7 +1137,7 @@ mail_index_keywords_create(struct mail_i
struct mail_keywords *k;
unsigned int src, dest, i, count;
- count = strarray_length(keywords);
+ count = str_array_length(keywords);
if (count == 0) {
k = i_new(struct mail_keywords, 1);
k->index = index;
diff -r 13b0a3ba5f7b -r 687efa138e77 src/lib-storage/index/index-mail-headers.c
--- a/src/lib-storage/index/index-mail-headers.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/lib-storage/index/index-mail-headers.c Sun Sep 16 13:38:34 2007 +0300
@@ -633,7 +633,7 @@ index_mail_headers_decode(struct index_m
unsigned int i, count;
buffer_t *buf;
- count = strarray_length(list);
+ count = str_array_length(list);
if (count > max_count)
count = max_count;
decoded_list = p_new(mail->data_pool, const char *, count + 1);
diff -r 13b0a3ba5f7b -r 687efa138e77 src/lib/strfuncs.c
--- a/src/lib/strfuncs.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/lib/strfuncs.c Sun Sep 16 13:38:34 2007 +0300
@@ -529,7 +529,7 @@ void p_strsplit_free(pool_t pool, char *
p_free(pool, arr);
}
-unsigned int strarray_length(const char *const *arr)
+unsigned int str_array_length(const char *const *arr)
{
unsigned int count;
@@ -572,7 +572,7 @@ const char *t_strarray_join(const char *
return str;
}
-bool strarray_remove(const char **arr, const char *value)
+bool str_array_remove(const char **arr, const char *value)
{
const char **dest;
diff -r 13b0a3ba5f7b -r 687efa138e77 src/lib/strfuncs.h
--- a/src/lib/strfuncs.h Sun Sep 16 13:32:59 2007 +0300
+++ b/src/lib/strfuncs.h Sun Sep 16 13:38:34 2007 +0300
@@ -81,12 +81,12 @@ const char *dec2str(uintmax_t number);
const char *dec2str(uintmax_t number);
/* Return length of NULL-terminated list string array */
-unsigned int strarray_length(const char *const *arr);
+unsigned int str_array_length(const char *const *arr);
/* Return all strings from array joined into one string. */
const char *t_strarray_join(const char *const *arr, const char *separator)
ATTR_MALLOC;
/* Removes a value from NULL-terminated string array. Returns TRUE if found. */
-bool strarray_remove(const char **arr, const char *value);
+bool str_array_remove(const char **arr, const char *value);
/* INTERNAL */
char *t_noalloc_strdup_vprintf(const char *format, va_list args,
diff -r 13b0a3ba5f7b -r 687efa138e77 src/plugins/acl/acl-backend.c
--- a/src/plugins/acl/acl-backend.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/plugins/acl/acl-backend.c Sun Sep 16 13:38:34 2007 +0300
@@ -41,7 +41,7 @@ acl_backend_init(const char *data, struc
i_info("acl: owner = %d", owner);
}
- group_count = strarray_length(groups);
+ group_count = str_array_length(groups);
if (strncmp(data, "vfile:", 6) == 0)
data += 6;
diff -r 13b0a3ba5f7b -r 687efa138e77 src/plugins/acl/acl-cache.c
--- a/src/plugins/acl/acl-cache.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/plugins/acl/acl-cache.c Sun Sep 16 13:38:34 2007 +0300
@@ -95,7 +95,7 @@ struct acl_mask *acl_cache_mask_init(str
buffer_t *bitmask;
t_push();
- rights_count = strarray_length(rights);
+ rights_count = str_array_length(rights);
bitmask = buffer_create_dynamic(pool_datastack_create(),
DEFAULT_ACL_RIGHTS_COUNT / CHAR_BIT);
for (i = 0; i < rights_count; i++) {
diff -r 13b0a3ba5f7b -r 687efa138e77 src/plugins/convert/convert-storage.c
--- a/src/plugins/convert/convert-storage.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/plugins/convert/convert-storage.c Sun Sep 16 13:38:34 2007 +0300
@@ -71,7 +71,7 @@ static int mailbox_copy_mails(struct mai
}
keywords_list = mail_get_keywords(mail);
- keywords = strarray_length(keywords_list) == 0 ? NULL :
+ keywords = str_array_length(keywords_list) == 0 ? NULL :
mailbox_keywords_create_valid(destbox, keywords_list);
ret = mailbox_copy(dest_trans, mail, mail_get_flags(mail),
diff -r 13b0a3ba5f7b -r 687efa138e77 src/plugins/expire/expire-env.c
--- a/src/plugins/expire/expire-env.c Sun Sep 16 13:32:59 2007 +0300
+++ b/src/plugins/expire/expire-env.c Sun Sep 16 13:38:34 2007 +0300
@@ -24,7 +24,7 @@ struct expire_env *expire_env_init(const
env->pool = pool;
names = p_strsplit(pool, str, " ");
- len = strarray_length((const char *const *)names);
+ len = str_array_length((const char *const *)names);
p_array_init(&env->expire_boxes, pool, len / 2);
for (; *names != NULL; names += 2) {
More information about the dovecot-cvs
mailing list