[dovecot-cvs] dovecot/src/lib-storage/index index-copy.c,1.24,1.25 index-messageset.c,1.10,1.11 index-messageset.h,1.4,1.5 index-update-flags.c,1.16,1.17

[cras at procontrol.fi]

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

Modified Files:
	index-copy.c index-messageset.c index-messageset.h 
	index-update-flags.c 
Log Message:
Naming change for function typedefs.



Index: index-copy.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-copy.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- index-copy.c	5 Jan 2003 13:09:52 -0000	1.24
+++ index-copy.c	11 Jan 2003 19:55:57 -0000	1.25
@@ -14,9 +14,9 @@
 	int copy_inside_mailbox;
 };
 
-static int copy_func(struct mail_index *index, struct mail_index_record *rec,
-		     unsigned int client_seq __attr_unused__,
-		     unsigned int idx_seq __attr_unused__, void *context)
+static int copy_cb(struct mail_index *index, struct mail_index_record *rec,
+		   unsigned int client_seq __attr_unused__,
+		   unsigned int idx_seq __attr_unused__, void *context)
 {
 	struct copy_context *ctx = context;
 	struct index_mailbox *dest_ibox = NULL;
@@ -82,7 +82,7 @@
 	ctx.dest = destbox;
 
 	failed = index_messageset_foreach(ibox, messageset, uidset,
-					  copy_func, &ctx) <= 0;
+					  copy_cb, &ctx) <= 0;
 
 	if (!index_storage_lock(ibox, MAIL_LOCK_UNLOCK))
 		return FALSE;

Index: index-messageset.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-messageset.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- index-messageset.c	5 Jan 2003 13:09:52 -0000	1.10
+++ index-messageset.c	11 Jan 2003 19:55:57 -0000	1.11
@@ -24,7 +24,7 @@
 
 static int mail_index_foreach(struct mail_index *index,
 			      unsigned int seq, unsigned int seq2,
-			      MsgsetForeachFunc func, void *context)
+			      msgset_foreach_callback_t callback, void *context)
 {
 	struct mail_index_record *rec;
 	const struct modify_log_expunge *expunges;
@@ -72,7 +72,7 @@
 			break;
 
 		t_push();
-		if (!func(index, rec, seq, idx_seq, context)) {
+		if (!callback(index, rec, seq, idx_seq, context)) {
 			t_pop();
 			return 0;
 		}
@@ -93,8 +93,8 @@
 static int mail_index_messageset_foreach(struct mail_index *index,
 					 const char *messageset,
 					 unsigned int messages_count,
-					 MsgsetForeachFunc func, void *context,
-					 const char **error)
+					 msgset_foreach_callback_t callback,
+					 void *context, const char **error)
 {
 	const char *input;
 	unsigned int seq, seq2;
@@ -164,7 +164,7 @@
 		}
 
 		t_push();
-		ret = mail_index_foreach(index, seq, seq2, func, context);
+		ret = mail_index_foreach(index, seq, seq2, callback, context);
 		t_pop();
 		if (ret <= 0)
 			return ret;
@@ -177,7 +177,8 @@
 
 static int mail_index_uid_foreach(struct mail_index *index,
 				  unsigned int uid, unsigned int uid2,
-				  MsgsetForeachFunc func, void *context)
+				  msgset_foreach_callback_t callback,
+				  void *context)
 {
 	struct mail_index_record *rec;
 	const struct modify_log_expunge *expunges;
@@ -215,7 +216,7 @@
 			   expunges->uid2 >= rec->uid));
 
 		t_push();
-		if (!func(index, rec, client_seq, idx_seq, context)) {
+		if (!callback(index, rec, client_seq, idx_seq, context)) {
 			t_pop();
 			return 0;
 		}
@@ -237,8 +238,8 @@
 static int mail_index_uidset_foreach(struct mail_index *index,
 				     const char *uidset,
 				     unsigned int messages_count,
-				     MsgsetForeachFunc func, void *context,
-				     const char **error)
+				     msgset_foreach_callback_t callback,
+				     void *context, const char **error)
 {
 	struct mail_index_record *rec;
 	const char *input;
@@ -299,7 +300,7 @@
 
 		t_push();
 		ret = mail_index_uid_foreach(index, uid, uid2,
-					     func, context);
+					     callback, context);
 		t_pop();
 		if (ret <= 0)
 			return ret;
@@ -312,7 +313,7 @@
 
 int index_messageset_foreach(struct index_mailbox *ibox,
 			     const char *messageset, int uidset,
-			     MsgsetForeachFunc func, void *context)
+			     msgset_foreach_callback_t callback, void *context)
 {
 	const char *error;
 	int ret;
@@ -320,11 +321,11 @@
 	if (uidset) {
 		ret = mail_index_uidset_foreach(ibox->index, messageset,
 						ibox->synced_messages_count,
-						func, context, &error);
+						callback, context, &error);
 	} else {
 		ret = mail_index_messageset_foreach(ibox->index, messageset,
 						    ibox->synced_messages_count,
-						    func, context, &error);
+						    callback, context, &error);
 	}
 
 	if (ret < 0) {

Index: index-messageset.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-messageset.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index-messageset.h	5 Jan 2003 13:09:52 -0000	1.4
+++ index-messageset.h	11 Jan 2003 19:55:57 -0000	1.5
@@ -4,16 +4,17 @@
 #include "index-storage.h"
 
 /* If FALSE is returned, the loop is stopped. */
-typedef int (*MsgsetForeachFunc)(struct mail_index *index,
-				 struct mail_index_record *rec,
-				 unsigned int client_seq, unsigned int idx_seq,
-				 void *context);
+typedef int (*msgset_foreach_callback_t)(struct mail_index *index,
+					 struct mail_index_record *rec,
+					 unsigned int client_seq,
+					 unsigned int idx_seq,
+					 void *context);
 
 /* Returns 1 if all were found, 2 if some messages were deleted,
-   0 func returned FALSE, -1 if internal error occured or -2 if messageset
+   0 callback returned FALSE, -1 if internal error occured or -2 if messageset
    was invalid. */
 int index_messageset_foreach(struct index_mailbox *ibox,
 			     const char *messageset, int uidset,
-			     MsgsetForeachFunc func, void *context);
+			     msgset_foreach_callback_t callback, void *context);
 
 #endif

Index: index-update-flags.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-update-flags.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- index-update-flags.c	5 Jan 2003 13:09:52 -0000	1.16
+++ index-update-flags.c	11 Jan 2003 19:55:57 -0000	1.17
@@ -12,9 +12,9 @@
 	int notify;
 };
 
-static int update_func(struct mail_index *index, struct mail_index_record *rec,
-		       unsigned int client_seq, unsigned int idx_seq,
-		       void *context)
+static int update_cb(struct mail_index *index, struct mail_index_record *rec,
+		     unsigned int client_seq, unsigned int idx_seq,
+		     void *context)
 {
 	struct update_context *ctx = context;
 	struct mail_storage *storage;
@@ -91,7 +91,7 @@
 	ctx.notify = notify;
 
 	ret = index_messageset_foreach(ibox, messageset, uidset,
-				       update_func, &ctx);
+				       update_cb, &ctx);
 
 	if (!index_storage_lock(ibox, MAIL_LOCK_UNLOCK))
 		return FALSE;