[dovecot-cvs] dovecot/src/lib buffer.c, 1.30, 1.31 module-dir.c, 1.14, 1.15 write-full.c, 1.7, 1.8

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib
In directory talvi:/tmp/cvs-serv11001/lib

Modified Files:
	buffer.c module-dir.c write-full.c 
Log Message:
While casting const pointers to something else, the const was often
unneededly dropped out in the middle of casts.



Index: buffer.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib/buffer.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- buffer.c	14 Jan 2006 18:47:22 -0000	1.30
+++ buffer.c	14 Feb 2006 18:59:12 -0000	1.31
@@ -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;
 }

Index: module-dir.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib/module-dir.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- module-dir.c	7 Feb 2006 10:07:42 -0000	1.14
+++ module-dir.c	14 Feb 2006 18:59:12 -0000	1.15
@@ -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);
 

Index: write-full.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib/write-full.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- write-full.c	28 Apr 2004 20:51:11 -0000	1.7
+++ write-full.c	14 Feb 2006 18:59:12 -0000	1.8
@@ -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;
 	}