Mercurial > dovecot > core-2.2

changeset 3278:df372eecc5d0 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Several size_t -> unsigned int changes. Try to keep "unsigned int" for counters, size_t for actual memory range sizes.
author Timo Sirainen <tss@iki.fi>
date Fri, 08 Apr 2005 15:14:41 +0300
parents f022867fb58d
children b698ae839a18
files src/auth/mech-plain.c src/lib-index/mail-cache-fields.c src/lib-index/mail-cache-lookup.c src/lib-index/mail-cache.h src/lib-index/mail-index-view-sync.c src/lib-index/mail-index.h src/lib-mail/istream-header-filter.c src/lib-mail/istream-header-filter.h src/lib-storage/index/index-mail-headers.c src/lib-storage/index/index-sync.c src/lib-storage/index/mbox/mbox-storage.c src/lib-storage/index/mbox/mbox-storage.h
diffstat 12 files changed, 38 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/mech-plain.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/auth/mech-plain.c	Fri Apr 08 15:14:41 2005 +0300
@@ -27,7 +27,8 @@
 {
 	const char *authid, *authenid, *error;
 	char *pass;
-	size_t i, count, len;
+	size_t i, len;
+	int count;
 
 	/* authorization ID \0 authentication ID \0 pass.
 	   we'll ignore authorization ID for now. */
--- a/src/lib-index/mail-cache-fields.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-index/mail-cache-fields.c	Fri Apr 08 15:14:41 2005 +0300
@@ -13,7 +13,7 @@
 
 void mail_cache_register_fields(struct mail_cache *cache,
 				struct mail_cache_field *fields,
-				size_t fields_count)
+				unsigned int fields_count)
 {
 	void *orig_key, *orig_value;
 	unsigned int new_idx;
--- a/src/lib-index/mail-cache-lookup.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-index/mail-cache-lookup.c	Fri Apr 08 15:14:41 2005 +0300
@@ -372,7 +372,7 @@
 
 struct header_lookup_context {
 	unsigned int *fields;
-	size_t fields_count;
+	unsigned int fields_count;
 	buffer_t *data;
 
 	unsigned int max_field;
@@ -425,7 +425,7 @@
 
 int mail_cache_lookup_headers(struct mail_cache_view *view, string_t *dest,
 			      uint32_t seq, unsigned int fields[],
-			      size_t fields_count)
+			      unsigned int fields_count)
 {
 	struct mail_cache *cache = view->cache;
 	struct header_lookup_context ctx;
--- a/src/lib-index/mail-cache.h	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-index/mail-cache.h	Fri Apr 08 15:14:41 2005 +0300
@@ -45,7 +45,7 @@
 /* Register fields. fields[].idx is updated to contain field index. */
 void mail_cache_register_fields(struct mail_cache *cache,
 				struct mail_cache_field *fields,
-				size_t fields_count);
+				unsigned int fields_count);
 /* Returns registered field index, or (unsigned int)-1 if not found. */
 unsigned int
 mail_cache_register_lookup(struct mail_cache *cache, const char *name);
@@ -85,7 +85,7 @@
    0 if not, -1 if error. dest is updated only if all fields were found. */
 int mail_cache_lookup_headers(struct mail_cache_view *view, string_t *dest,
 			      uint32_t seq, unsigned int fields[],
-			      size_t fields_count);
+			      unsigned int fields_count);
 
 /* "Error in index cache file %s: ...". */
 void mail_cache_set_corrupted(struct mail_cache *cache, const char *fmt, ...)
--- a/src/lib-index/mail-index-view-sync.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-index/mail-index-view-sync.c	Fri Apr 08 15:14:41 2005 +0300
@@ -363,7 +363,7 @@
 
 const uint32_t *
 mail_index_view_sync_get_expunges(struct mail_index_view_sync_ctx *ctx,
-				  size_t *count_r)
+				  unsigned int *count_r)
 {
 	const uint32_t *data;
 	size_t size;
--- a/src/lib-index/mail-index.h	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-index/mail-index.h	Fri Apr 08 15:14:41 2005 +0300
@@ -252,7 +252,7 @@
 			      struct mail_index_sync_rec *sync_rec);
 const uint32_t *
 mail_index_view_sync_get_expunges(struct mail_index_view_sync_ctx *ctx,
-				 size_t *count_r);
+				 unsigned int *count_r);
 void mail_index_view_sync_end(struct mail_index_view_sync_ctx *ctx);
 
 /* Returns the index header. */
--- a/src/lib-mail/istream-header-filter.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-mail/istream-header-filter.c	Fri Apr 08 15:14:41 2005 +0300
@@ -17,7 +17,7 @@
 	uoff_t start_offset;
 
 	const char **headers;
-	size_t headers_count;
+	unsigned int headers_count;
 
 	header_filter_callback *callback;
 	void *context;
@@ -284,12 +284,13 @@
 struct istream *
 i_stream_create_header_filter(struct istream *input,
                               enum header_filter_flags flags,
-			      const char *const *headers, size_t headers_count,
+			      const char *const *headers,
+			      unsigned int headers_count,
 			      header_filter_callback *callback, void *context)
 {
 	struct header_filter_istream *mstream;
 	pool_t pool;
-	size_t i;
+	unsigned int i;
 
 	i_assert((flags & (HEADER_FILTER_INCLUDE|HEADER_FILTER_EXCLUDE)) != 0);
 
--- a/src/lib-mail/istream-header-filter.h	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-mail/istream-header-filter.h	Fri Apr 08 15:14:41 2005 +0300
@@ -22,7 +22,8 @@
 struct istream *
 i_stream_create_header_filter(struct istream *input,
 			      enum header_filter_flags flags,
-			      const char *const *headers, size_t headers_count,
+			      const char *const *headers,
+			      unsigned int headers_count,
 			      header_filter_callback *callback, void *context);
 
 #endif
--- a/src/lib-storage/index/index-mail-headers.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-storage/index/index-mail-headers.c	Fri Apr 08 15:14:41 2005 +0300
@@ -18,7 +18,7 @@
 	struct mailbox_header_lookup_ctx ctx;
 	pool_t pool;
 
-	size_t count;
+	unsigned int count;
 	unsigned int *idx;
 	const char **name;
 };
@@ -600,46 +600,44 @@
 	struct index_header_lookup_ctx *ctx;
 	const char *const *name;
 	const char **sorted_headers;
-	buffer_t *buf;
 	pool_t pool;
-	size_t i, size;
+	unsigned int i, count;
 
-	for (size = 0, name = headers; *name != NULL; name++)
-		size++;
+	for (count = 0, name = headers; *name != NULL; name++)
+		count++;
 
 	t_push();
 
-	if (size > 0) {
-		/* headers need to be sorted for filter stream. */
-		sorted_headers = t_new(const char *, size);
-		memcpy(sorted_headers, headers, size * sizeof(*sorted_headers));
-		qsort(sorted_headers, size, sizeof(*sorted_headers),
+	if (count > 0) {
+		/* @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);
 		headers = sorted_headers;
 	}
 
-	buf = buffer_create_dynamic(pool_datastack_create(), 128);
-	for (i = 0; i < size; i++) {
+	/* @UNSAFE */
+	fields = t_new(struct mail_cache_field, count);
+	for (i = 0; i < count; i++) {
 		header_field.name = t_strconcat("hdr.", headers[i], NULL);
-		buffer_append(buf, &header_field, sizeof(header_field));
+		fields[i] = header_field;
 	}
-
-	fields = buffer_get_modifyable_data(buf, &size);
-	size /= sizeof(*fields);
-	mail_cache_register_fields(ibox->cache, fields, size);
+	mail_cache_register_fields(ibox->cache, fields, count);
 
 	pool = pool_alloconly_create("index_header_lookup_ctx", 256);
 	ctx = p_new(pool, struct index_header_lookup_ctx, 1);
 	ctx->ctx.box = box;
 	ctx->pool = pool;
-	ctx->count = size;
+	ctx->count = count;
 
-	if (size > 0) {
-		ctx->idx = p_new(pool, unsigned int, size);
-		ctx->name = p_new(pool, const char *, size);
+	if (count > 0) {
+		ctx->idx = p_new(pool, unsigned int, count);
+		ctx->name = p_new(pool, const char *, count);
 
 		/* @UNSAFE */
-		for (i = 0; i < size; i++) {
+		for (i = 0; i < count; i++) {
 			ctx->idx[i] = fields[i].idx;
 			ctx->name[i] = p_strdup(pool, headers[i]);
 		}
--- a/src/lib-storage/index/index-sync.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-storage/index/index-sync.c	Fri Apr 08 15:14:41 2005 +0300
@@ -11,7 +11,7 @@
 	uint32_t messages_count;
 
 	const uint32_t *expunges;
-	size_t expunges_count;
+	unsigned int expunges_count;
 	int failed;
 };
 
--- a/src/lib-storage/index/mbox/mbox-storage.c	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-storage.c	Fri Apr 08 15:14:41 2005 +0300
@@ -32,7 +32,7 @@
 	"X-Status",
 	"X-UID",
 };
-size_t mbox_hide_headers_count = 7;
+unsigned int mbox_hide_headers_count = 7;
 
 extern struct mail_storage mbox_storage;
 extern struct mailbox mbox_mailbox;
--- a/src/lib-storage/index/mbox/mbox-storage.h	Fri Apr 08 15:11:35 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-storage.h	Fri Apr 08 15:14:41 2005 +0300
@@ -21,7 +21,7 @@
 
 extern struct mail_vfuncs mbox_mail_vfuncs;
 extern const char *mbox_hide_headers[];
-extern size_t mbox_hide_headers_count;
+extern unsigned int mbox_hide_headers_count;
 
 int mbox_set_syscall_error(struct index_mailbox *ibox, const char *function);