Mercurial > dovecot > core-2.2

changeset 4020:fcfd44f56b04 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
While casting const pointers to something else, the const was often unneededly dropped out in the middle of casts.
author Timo Sirainen <tss@iki.fi>
date Tue, 14 Feb 2006 20:59:09 +0200
parents 19dad76ef68d
children d7d87f1de71d
files src/auth/mech-ntlm.c src/auth/mech-rpa.c src/imap/imap-sort.c src/lib-index/mail-cache-fields.c src/lib-index/mail-index-sync-update.c src/lib-ntlm/ntlm-byteorder.h src/lib-ntlm/ntlm-message.c src/lib-storage/index/dbox/dbox-file.c src/lib/buffer.c src/lib/module-dir.c src/lib/write-full.c
diffstat 11 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/mech-ntlm.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/auth/mech-ntlm.c	Tue Feb 14 20:59:09 2006 +0200
@@ -192,7 +192,7 @@
 
 	if (!request->challenge) {
 		const struct ntlmssp_request *ntlm_request =
-			(struct ntlmssp_request *)data;
+			(const struct ntlmssp_request *)data;
 		const struct ntlmssp_challenge *message;
 		size_t message_size;
 		uint32_t flags;
@@ -216,7 +216,7 @@
 				       message, message_size);
 	} else {
 		const struct ntlmssp_response *response =
-			(struct ntlmssp_response *)data;
+			(const struct ntlmssp_response *)data;
 		const char *username;
 
 		if (!ntlmssp_check_response(response, data_size, &error)) {
--- a/src/auth/mech-rpa.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/auth/mech-rpa.c	Tue Feb 14 20:59:09 2006 +0200
@@ -180,7 +180,7 @@
 static bool
 rpa_parse_token1(const void *data, size_t data_size, const char **error)
 {
-	const unsigned char *end = ((unsigned char *) data) + data_size;
+	const unsigned char *end = ((const unsigned char *) data) + data_size;
 	const unsigned char *p;
 	unsigned int version_lo, version_hi;
 
@@ -262,7 +262,7 @@
 		 size_t data_size, const char **error)
 {
 	struct auth_request *auth_request = &request->auth_request;
-	const unsigned char *end = ((unsigned char *)data) + data_size;
+	const unsigned char *end = ((const unsigned char *)data) + data_size;
 	const unsigned char *p;
 	unsigned int len;
 	const char *user, *realm;
--- a/src/imap/imap-sort.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/imap/imap-sort.c	Tue Feb 14 20:59:09 2006 +0200
@@ -498,7 +498,7 @@
 
 static struct mail *get_mail(struct sort_context *ctx, const unsigned char *buf)
 {
-	unsigned int id = *((unsigned int *) buf);
+	unsigned int id = *((const unsigned int *)buf);
 	uint32_t seq;
 
 	if (!ctx->id_is_uid)
@@ -689,7 +689,8 @@
 	t_pop();
 
 	return ret != 0 ? ret :
-		(*((unsigned int *) p1) < *((unsigned int *) p2) ? -1 : 1);
+		(*((const unsigned int *)p1) <
+		 *((const unsigned int *)p2) ? -1 : 1);
 }
 
 static void mail_sort_flush(struct sort_context *ctx)
--- a/src/lib-index/mail-cache-fields.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib-index/mail-cache-fields.c	Tue Feb 14 20:59:09 2006 +0200
@@ -16,6 +16,7 @@
 				unsigned int fields_count)
 {
 	void *orig_key, *orig_value;
+	char *name;
 	unsigned int new_idx;
 	unsigned int i, j;
 
@@ -60,9 +61,9 @@
 			continue;
 
 		/* new index - save it */
+		name = p_strdup(cache->field_pool, fields[i].name);
 		cache->fields[idx].field = fields[i];
-		cache->fields[idx].field.name =
-			p_strdup(cache->field_pool, fields[i].name);
+		cache->fields[idx].field.name = name;
 		cache->field_file_map[idx] = (uint32_t)-1;
 
 		switch (cache->fields[idx].field.type) {
@@ -76,9 +77,7 @@
 			break;
 		}
 
-		hash_insert(cache->field_name_hash,
-			    (char *)cache->fields[idx].field.name,
-			    POINTER_CAST(idx));
+		hash_insert(cache->field_name_hash, name, POINTER_CAST(idx));
 	}
 	cache->fields_count = new_idx;
 }
--- a/src/lib-index/mail-index-sync-update.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib-index/mail-index-sync-update.c	Tue Feb 14 20:59:09 2006 +0200
@@ -749,7 +749,7 @@
 
 		memcpy(map->mmap_base, &map->hdr, base_size);
 		memcpy(PTR_OFFSET(map->mmap_base, base_size),
-		       PTR_OFFSET(map->hdr_base, base_size),
+		       CONST_PTR_OFFSET(map->hdr_base, base_size),
 		       map->hdr.header_size - base_size);
 		if (msync(map->mmap_base, map->mmap_used_size, MS_SYNC) < 0) {
 			mail_index_set_syscall_error(index, "msync()");
--- a/src/lib-ntlm/ntlm-byteorder.h	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib-ntlm/ntlm-byteorder.h	Tue Feb 14 20:59:09 2006 +0200
@@ -16,17 +16,17 @@
 
 static inline uint16_t read_le16(const void *addr)
 {
-	return *((uint16_t *) addr);
+	return *((const uint16_t *) addr);
 }
 
 static inline uint32_t read_le32(const void *addr)
 {
-	return *((uint32_t *) addr);
+	return *((const uint32_t *) addr);
 }
 
 static inline uint64_t read_le64(const void *addr)
 {
-	return *((uint64_t *) addr);
+	return *((const uint64_t *) addr);
 }
 
 static inline void write_le16(void *addr, const uint16_t value)
--- a/src/lib-ntlm/ntlm-message.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib-ntlm/ntlm-message.c	Tue Feb 14 20:59:09 2006 +0200
@@ -25,7 +25,7 @@
 			     bool unicode)
 {
 	unsigned int len = read_le16(&buffer->length);
-	const char *p = ((char *) message) + read_le32(&buffer->offset);
+	const char *p = ((const char *) message) + read_le32(&buffer->offset);
 	string_t *str;
 
 	if (unicode)
--- a/src/lib-storage/index/dbox/dbox-file.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib-storage/index/dbox/dbox-file.c	Tue Feb 14 20:59:09 2006 +0200
@@ -33,8 +33,8 @@
 	}
 
 	/* success */
-	*file_seq_r = *((uint32_t *)data1);
-	*offset_r = *((uint64_t *)data2);
+	*file_seq_r = *((const uint32_t *)data1);
+	*offset_r = *((const uint64_t *)data2);
 	return 1;
 }
 
--- a/src/lib/buffer.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib/buffer.c	Tue Feb 14 20:59:09 2006 +0200
@@ -227,7 +227,7 @@
 		 const buffer_t *_src, size_t src_pos, size_t copy_size)
 {
 	struct real_buffer *dest = (struct real_buffer *)_dest;
-	struct real_buffer *src = (struct real_buffer *)_src;
+	const struct real_buffer *src = (const struct real_buffer *)_src;
 	size_t max_size;
 
 	i_assert(src_pos <= src->used);
@@ -267,7 +267,7 @@
 
 void *buffer_get_modifyable_data(const buffer_t *_buf, size_t *used_size_r)
 {
-	struct real_buffer *buf = (struct real_buffer *)_buf;
+	const struct real_buffer *buf = (const struct real_buffer *)_buf;
 
 	if (used_size_r != NULL)
 		*used_size_r = buf->used;
@@ -288,7 +288,7 @@
 
 size_t buffer_get_size(const buffer_t *_buf)
 {
-	struct real_buffer *buf = (struct real_buffer *)_buf;
+	const struct real_buffer *buf = (const struct real_buffer *)_buf;
 
 	return buf->alloc;
 }
--- a/src/lib/module-dir.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib/module-dir.c	Tue Feb 14 20:59:09 2006 +0200
@@ -75,10 +75,10 @@
 	module->handle = handle;
 
 	/* get our init func */
-	init = (void (*)())
+	init = (void (*)(void))
 		get_symbol(module, t_strconcat(name, "_init", NULL),
 			   !require_init_funcs);
-	module->deinit = init == NULL ? NULL : (void (*)())
+	module->deinit = init == NULL ? NULL : (void (*)(void))
 		get_symbol(module, t_strconcat(name, "_deinit", NULL),
 			   !require_init_funcs);
 
--- a/src/lib/write-full.c	Tue Feb 14 20:58:07 2006 +0200
+++ b/src/lib/write-full.c	Tue Feb 14 20:59:09 2006 +0200
@@ -21,7 +21,7 @@
 			return -1;
 		}
 
-		data = PTR_OFFSET(data, ret);
+		data = CONST_PTR_OFFSET(data, ret);
 		size -= ret;
 	}
 
@@ -45,7 +45,7 @@
 			return -1;
 		}
 
-		data = PTR_OFFSET(data, ret);
+		data = CONST_PTR_OFFSET(data, ret);
 		size -= ret;
 		offset += ret;
 	}