[dovecot-cvs] dovecot/src/lib-index/mbox mbox-append.c,1.37,1.38 mbox-index.c,1.59,1.60 mbox-index.h,1.23,1.24 mbox-lock.c,1.23,1.24 mbox-rewrite.c,1.50,1.51 mbox-sync-full.c,1.9,1.10

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index/mbox
In directory danu:/tmp/cvs-serv27659/lib-index/mbox

Modified Files:
	mbox-append.c mbox-index.c mbox-index.h mbox-lock.c 
	mbox-rewrite.c mbox-sync-full.c 
Log Message:
Naming change for function typedefs.



Index: mbox-append.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-append.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- mbox-append.c	5 Jan 2003 13:09:52 -0000	1.37
+++ mbox-append.c	11 Jan 2003 19:55:56 -0000	1.38
@@ -75,7 +75,7 @@
 	   from Status and X-Status fields. temporarily limit the stream length
 	   so the message body is parsed properly.
 
-	   the stream length limit is raised again by mbox_header_func after
+	   the stream length limit is raised again by mbox_header_cb after
 	   reading the headers. it uses Content-Length if available or finds
 	   the next From-line. */
 	mbox_header_init_context(&ctx, index, input);
@@ -84,7 +84,7 @@
 	i_stream_seek(input, abs_start_offset - input->start_offset);
 
 	i_stream_set_read_limit(input, eoh_offset);
-	mail_index_update_headers(update, input, 0, mbox_header_func, &ctx);
+	mail_index_update_headers(update, input, 0, mbox_header_cb, &ctx);
 
 	i_stream_seek(input, input->v_limit);
 	i_stream_set_read_limit(input, 0);

Index: mbox-index.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-index.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- mbox-index.c	5 Jan 2003 13:09:52 -0000	1.59
+++ mbox-index.c	11 Jan 2003 19:55:56 -0000	1.60
@@ -248,10 +248,10 @@
 	return ret > 0;
 }
 
-void mbox_header_func(struct message_part *part __attr_unused__,
-		      const unsigned char *name, size_t name_len,
-		      const unsigned char *value, size_t value_len,
-		      void *context)
+void mbox_header_cb(struct message_part *part __attr_unused__,
+		    const unsigned char *name, size_t name_len,
+		    const unsigned char *value, size_t value_len,
+		    void *context)
 {
 	struct mbox_header_context *ctx = context;
 	uoff_t start_offset, end_offset;

Index: mbox-index.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-index.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mbox-index.h	5 Jan 2003 13:09:52 -0000	1.23
+++ mbox-index.h	11 Jan 2003 19:55:56 -0000	1.24
@@ -31,10 +31,10 @@
 			      struct mail_index *index,
 			      struct istream *input);
 void mbox_header_free_context(struct mbox_header_context *ctx);
-void mbox_header_func(struct message_part *part __attr_unused__,
-		      const unsigned char *name, size_t name_len,
-		      const unsigned char *value, size_t value_len,
-		      void *context);
+void mbox_header_cb(struct message_part *part __attr_unused__,
+		    const unsigned char *name, size_t name_len,
+		    const unsigned char *value, size_t value_len,
+		    void *context);
 void mbox_keywords_parse(const unsigned char *value, size_t len,
 			 const char *custom_flags[MAIL_CUSTOM_FLAGS_COUNT],
 			 void (*func)(const unsigned char *, size_t,

Index: mbox-lock.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-lock.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mbox-lock.c	10 Jan 2003 11:22:50 -0000	1.23
+++ mbox-lock.c	11 Jan 2003 19:55:56 -0000	1.24
@@ -91,11 +91,11 @@
 			return FALSE;
 		}
 
-		if (now != last_notify && index->lock_notify_func != NULL) {
+		if (now != last_notify && index->lock_notify_cb != NULL) {
 			last_notify = now;
-			index->lock_notify_func(MAIL_LOCK_NOTIFY_MAILBOX_ABORT,
-						max_wait_time - now,
-						index->lock_notify_context);
+			index->lock_notify_cb(MAIL_LOCK_NOTIFY_MAILBOX_ABORT,
+					      max_wait_time - now,
+					      index->lock_notify_context);
 		}
 
 		usleep(LOCK_RANDOM_USLEEP_TIME);
@@ -131,10 +131,10 @@
 			return FALSE;
 		}
 
-		if (index->lock_notify_func != NULL) {
-			index->lock_notify_func(MAIL_LOCK_NOTIFY_MAILBOX_ABORT,
-						max_wait_time - now,
-						index->lock_notify_context);
+		if (index->lock_notify_cb != NULL) {
+			index->lock_notify_cb(MAIL_LOCK_NOTIFY_MAILBOX_ABORT,
+					      max_wait_time - now,
+					      index->lock_notify_context);
 		}
 	}
 
@@ -186,17 +186,17 @@
 			}
 
 			if (last_notify != now &&
-			    index->lock_notify_func != NULL) {
+			    index->lock_notify_cb != NULL) {
 				last_notify = now;
 				if (now > last_change + stale_notify) {
 					secs_left = now - last_change +
 						dotlock_change_timeout;
-					index->lock_notify_func(
+					index->lock_notify_cb(
 					      MAIL_LOCK_NOTIFY_MAILBOX_OVERRIDE,
 					      secs_left,
 					      index->lock_notify_context);
 				} else {
-					index->lock_notify_func(
+					index->lock_notify_cb(
 						MAIL_LOCK_NOTIFY_MAILBOX_ABORT,
 						max_wait_time - now,
 						index->lock_notify_context);

Index: mbox-rewrite.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-rewrite.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- mbox-rewrite.c	5 Jan 2003 13:09:52 -0000	1.50
+++ mbox-rewrite.c	11 Jan 2003 19:55:56 -0000	1.51
@@ -243,10 +243,10 @@
 	return str_len(str) == 0 ? NULL : str_c(str);
 }
 
-static void header_func(struct message_part *part __attr_unused__,
-			const unsigned char *name, size_t name_len,
-			const unsigned char *value, size_t value_len,
-			void *context)
+static void header_cb(struct message_part *part __attr_unused__,
+		      const unsigned char *name, size_t name_len,
+		      const unsigned char *value, size_t value_len,
+		      void *context)
 {
 	struct mbox_rewrite_context *ctx = context;
 	const char *str;
@@ -338,7 +338,7 @@
 	ctx.custom_flags = mail_custom_flags_list_get(index->custom_flags);
 
 	i_stream_set_read_limit(input, input->v_offset + hdr_size);
-	message_parse_header(NULL, input, &hdr_parsed_size, header_func, &ctx);
+	message_parse_header(NULL, input, &hdr_parsed_size, header_cb, &ctx);
 	i_stream_set_read_limit(input, 0);
 
 	i_assert(hdr_parsed_size.physical_size == hdr_size);

Index: mbox-sync-full.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-sync-full.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mbox-sync-full.c	5 Jan 2003 13:09:52 -0000	1.9
+++ mbox-sync-full.c	11 Jan 2003 19:55:56 -0000	1.10
@@ -132,7 +132,7 @@
 			   message flags in Status and X-Status fields */
 			mbox_header_init_context(&ctx, index, input);
 			message_parse_header(NULL, input, &hdr_parsed_size,
-					     mbox_header_func, &ctx);
+					     mbox_header_cb, &ctx);
 			md5_final(&ctx.md5, current_digest);
 
 			mbox_header_free_context(&ctx);