Mercurial > dovecot > original-hg > dovecot-1.2

changeset 3061:42c1ca1f7a45 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed strarray_join() to t_strarray_join() and made it not to crash..
author Timo Sirainen <tss@iki.fi>
date Fri, 07 Jan 2005 20:09:40 +0200
parents 4242c19c8617
children 5e2e4cdbfe2e
files src/auth/passdb-ldap.c src/auth/userdb-ldap.c src/lib/strfuncs.c src/lib/strfuncs.h
diffstat 4 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/passdb-ldap.c	Fri Jan 07 19:34:07 2005 +0200
+++ b/src/auth/passdb-ldap.c	Fri Jan 07 20:09:40 2005 +0200
@@ -177,8 +177,8 @@
 		i_info("ldap(%s): base=%s scope=%s filter=%s fields=%s",
 		       get_log_prefix(auth_request), conn->set.base,
 		       conn->set.scope, filter,
-		       strarray_join((const char **)
-				     passdb_ldap_conn->attr_names, ","));
+		       t_strarray_join((const char **)
+				       passdb_ldap_conn->attr_names, ","));
 	}
 
 	db_ldap_search(conn, conn->set.base, conn->set.ldap_scope,
--- a/src/auth/userdb-ldap.c	Fri Jan 07 19:34:07 2005 +0200
+++ b/src/auth/userdb-ldap.c	Fri Jan 07 20:09:40 2005 +0200
@@ -188,8 +188,8 @@
 		i_info("ldap(%s): base=%s scope=%s filter=%s fields=%s",
 		       get_log_prefix(auth_request), conn->set.base,
 		       conn->set.scope, filter,
-		       strarray_join((const char **)
-				     userdb_ldap_conn->attr_names, ","));
+		       t_strarray_join((const char **)
+				       userdb_ldap_conn->attr_names, ","));
 	}
 
 	db_ldap_search(conn, conn->set.base, conn->set.ldap_scope,
--- a/src/lib/strfuncs.c	Fri Jan 07 19:34:07 2005 +0200
+++ b/src/lib/strfuncs.c	Fri Jan 07 20:09:40 2005 +0200
@@ -558,11 +558,12 @@
 	return count;
 }
 
-const char *strarray_join(const char *const *arr, const char *separator)
+const char *t_strarray_join(const char *const *arr, const char *separator)
 {
 	size_t alloc_len, sep_len, len, pos, needed_space;
 	char *str;
 
+	sep_len = strlen(separator);
         alloc_len = 64;
         str = t_buffer_get(alloc_len);
 
--- a/src/lib/strfuncs.h	Fri Jan 07 19:34:07 2005 +0200
+++ b/src/lib/strfuncs.h	Fri Jan 07 20:09:40 2005 +0200
@@ -68,7 +68,7 @@
 /* Return length of NULL-terminated list string array */
 unsigned int strarray_length(const char *const *arr);
 /* Return all strings from array joined into one string. */
-const char *strarray_join(const char *const *arr, const char *separator);
+const char *t_strarray_join(const char *const *arr, const char *separator);
 
 /* INTERNAL */
 const char *_vstrconcat(const char *str1, va_list args, size_t *ret_len);