Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6423:13b0a3ba5f7b HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added i_ prefix to strcmp_p(), strcasecmp_p() and memcasecmp().
author Timo Sirainen <tss@iki.fi>
date Sun, 16 Sep 2007 13:32:59 +0300
parents 18173a52f721
children 687efa138e77
files src/imap/imap-fetch-body.c src/lib-mail/message-date.c src/lib-mail/message-decoder.c src/lib-storage/index/index-mail-headers.c src/lib-storage/index/mbox/mbox-from.c src/lib/strfuncs.c src/lib/strfuncs.h src/plugins/acl/acl-backend.c
diffstat 8 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/imap-fetch-body.c	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/imap/imap-fetch-body.c	Sun Sep 16 13:32:59 2007 +0300
@@ -756,7 +756,7 @@
 	}
 	str_append_c(str, ')');
 
-	qsort(arr, args_count, sizeof(*arr), strcasecmp_p);
+	qsort(arr, args_count, sizeof(*arr), i_strcasecmp_p);
 	body->fields = arr;
 	body->fields_count = args_count;
 	body->section = str_c(str);
--- a/src/lib-mail/message-date.c	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/lib-mail/message-date.c	Sun Sep 16 13:32:59 2007 +0300
@@ -147,7 +147,7 @@
 		return FALSE;
 
 	for (i = 0; i < 12; i++) {
-		if (memcasecmp(month_names[i], value, 3) == 0) {
+		if (i_memcasecmp(month_names[i], value, 3) == 0) {
 			tm.tm_mon = i;
 			break;
 		}
--- a/src/lib-mail/message-decoder.c	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/lib-mail/message-decoder.c	Sun Sep 16 13:32:59 2007 +0300
@@ -88,18 +88,18 @@
 
 	switch (str_len(value)) {
 	case 4:
-		if (memcasecmp(str_data(value), "7bit", 4) == 0 ||
-		    memcasecmp(str_data(value), "8bit", 4) == 0)
+		if (i_memcasecmp(str_data(value), "7bit", 4) == 0 ||
+		    i_memcasecmp(str_data(value), "8bit", 4) == 0)
 			ctx->content_type = CONTENT_TYPE_BINARY;
 		break;
 	case 6:
-		if (memcasecmp(str_data(value), "base64", 6) == 0)
+		if (i_memcasecmp(str_data(value), "base64", 6) == 0)
 			ctx->content_type = CONTENT_TYPE_BASE64;
-		else if (memcasecmp(str_data(value), "binary", 6) == 0)
+		else if (i_memcasecmp(str_data(value), "binary", 6) == 0)
 			ctx->content_type = CONTENT_TYPE_BINARY;
 		break;
 	case 16:
-		if (memcasecmp(str_data(value), "quoted-printable", 16) == 0)
+		if (i_memcasecmp(str_data(value), "quoted-printable", 16) == 0)
 			ctx->content_type = CONTENT_TYPE_QP;
 		break;
 	}
--- a/src/lib-storage/index/index-mail-headers.c	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/lib-storage/index/index-mail-headers.c	Sun Sep 16 13:32:59 2007 +0300
@@ -764,7 +764,7 @@
 	/* @UNSAFE: headers need to be sorted for filter stream. */
 	sorted_headers = t_new(const char *, count);
 	memcpy(sorted_headers, headers, count * sizeof(*sorted_headers));
-	qsort(sorted_headers, count, sizeof(*sorted_headers), strcasecmp_p);
+	qsort(sorted_headers, count, sizeof(*sorted_headers), i_strcasecmp_p);
 	headers = sorted_headers;
 
 	/* @UNSAFE */
--- a/src/lib-storage/index/mbox/mbox-from.c	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-from.c	Sun Sep 16 13:32:59 2007 +0300
@@ -22,7 +22,7 @@
 	int i;
 
 	for (i = 0; i < 12; i++) {
-		if (memcasecmp(months[i], msg, 3) == 0) {
+		if (i_memcasecmp(months[i], msg, 3) == 0) {
 			tm->tm_mon = i;
 			break;
 		}
--- a/src/lib/strfuncs.c	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/lib/strfuncs.c	Sun Sep 16 13:32:59 2007 +0300
@@ -395,7 +395,7 @@
 	return strcmp(s1, s2);
 }
 
-int memcasecmp(const void *p1, const void *p2, size_t size)
+int i_memcasecmp(const void *p1, const void *p2, size_t size)
 {
 	const unsigned char *s1 = p1;
 	const unsigned char *s2 = p2;
@@ -420,7 +420,7 @@
 	return strcmp(key, *member);
 }
 
-int strcmp_p(const void *p1, const void *p2)
+int i_strcmp_p(const void *p1, const void *p2)
 {
 	const char *const *s1 = p1, *const *s2 = p2;
 
@@ -435,7 +435,7 @@
 	return strcasecmp(key, *member);
 }
 
-int strcasecmp_p(const void *p1, const void *p2)
+int i_strcasecmp_p(const void *p1, const void *p2)
 {
 	const char *const *s1 = p1, *const *s2 = p2;
 
--- a/src/lib/strfuncs.h	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/lib/strfuncs.h	Sun Sep 16 13:32:59 2007 +0300
@@ -59,11 +59,11 @@
 const char *t_str_ucase(const char *str);
 
 int null_strcmp(const char *s1, const char *s2);
-int memcasecmp(const void *p1, const void *p2, size_t size);
 int bsearch_strcmp(const void *p1, const void *p2);
-int strcmp_p(const void *p1, const void *p2);
 int bsearch_strcasecmp(const void *p1, const void *p2);
-int strcasecmp_p(const void *p1, const void *p2);
+int i_memcasecmp(const void *p1, const void *p2, size_t size);
+int i_strcmp_p(const void *p1, const void *p2);
+int i_strcasecmp_p(const void *p1, const void *p2);
 
 /* separators is an array of separator characters, not a separator string. */
 char **p_strsplit(pool_t pool, const char *data, const char *separators)
--- a/src/plugins/acl/acl-backend.c	Sun Sep 16 13:30:31 2007 +0300
+++ b/src/plugins/acl/acl-backend.c	Sun Sep 16 13:32:59 2007 +0300
@@ -64,7 +64,7 @@
 		for (i = 0; i < group_count; i++)
 			backend->groups[i] = groups[i];
 		qsort(backend->groups, group_count, sizeof(const char *),
-		      strcmp_p);
+		      i_strcmp_p);
 	}
 
 	if (acl_backend_vfile.init(backend, data) < 0)