[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-copy.c,1.17,1.18 maildir-list.c,1.7,1.8 maildir-storage.h,1.9,1.10

[cras at procontrol.fi]

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

Modified Files:
	maildir-copy.c maildir-list.c maildir-storage.h 
Log Message:
Naming change for function typedefs.



Index: maildir-copy.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-copy.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- maildir-copy.c	5 Jan 2003 13:09:52 -0000	1.17
+++ maildir-copy.c	11 Jan 2003 19:55:57 -0000	1.18
@@ -16,10 +16,10 @@
 	const char **custom_flags;
 };
 
-static int copy_hard_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_hard_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_hard_context *ctx = context;
 	enum mail_flags flags;
@@ -77,7 +77,7 @@
 	ctx.custom_flags = mail_custom_flags_list_get(src->index->custom_flags);
 
 	ret = index_messageset_foreach(src, messageset, uidset,
-				       copy_hard_func, &ctx);
+				       copy_hard_cb, &ctx);
 
 	(void)index_storage_lock(src, MAIL_LOCK_UNLOCK);
 

Index: maildir-list.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-list.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- maildir-list.c	5 Jan 2003 13:09:52 -0000	1.7
+++ maildir-list.c	11 Jan 2003 19:55:57 -0000	1.8
@@ -12,7 +12,7 @@
 #include <sys/stat.h>
 
 struct find_subscribed_context {
-	MailboxFunc func;
+	mailbox_list_callback_t callback;
 	void *context;
 };
 
@@ -72,7 +72,7 @@
 }
 
 int maildir_find_mailboxes(struct mail_storage *storage, const char *mask,
-			   MailboxFunc func, void *context)
+			   mailbox_list_callback_t callback, void *context)
 {
         struct imap_match_glob *glob;
 	DIR *dirp;
@@ -142,21 +142,21 @@
 
 		t_push();
 		flags = maildir_get_marked_flags(storage, path);
-		func(storage, fname+1, flags, context);
+		callback(storage, fname+1, flags, context);
 		t_pop();
 	}
 
 	if (!failed && !found_inbox && imap_match(glob, "INBOX") > 0) {
 		/* .INBOX directory doesn't exist yet, but INBOX still exists */
-		func(storage, "INBOX", 0, context);
+		callback(storage, "INBOX", 0, context);
 	}
 
 	(void)closedir(dirp);
 	return !failed;
 }
 
-static int maildir_subs_func(struct mail_storage *storage, const char *name,
-			     void *context)
+static int maildir_subs_cb(struct mail_storage *storage, const char *name,
+			   void *context)
 {
 	struct find_subscribed_context *ctx = context;
 	enum mailbox_flags flags;
@@ -172,19 +172,19 @@
 			flags = MAILBOX_NOSELECT;
 	}
 
-	ctx->func(storage, name, flags, ctx->context);
+	ctx->callback(storage, name, flags, ctx->context);
 	return TRUE;
 }
 
 int maildir_find_subscribed(struct mail_storage *storage, const char *mask,
-			    MailboxFunc func, void *context)
+			    mailbox_list_callback_t callback, void *context)
 {
 	struct find_subscribed_context ctx;
 
-	ctx.func = func;
+	ctx.callback = callback;
 	ctx.context = context;
 
-	if (subsfile_foreach(storage, mask, maildir_subs_func, &ctx) <= 0)
+	if (subsfile_foreach(storage, mask, maildir_subs_cb, &ctx) <= 0)
 		return FALSE;
 
 	return TRUE;

Index: maildir-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- maildir-storage.h	5 Jan 2003 13:09:52 -0000	1.9
+++ maildir-storage.h	11 Jan 2003 19:55:57 -0000	1.10
@@ -11,9 +11,9 @@
 			 struct istream *data, uoff_t data_size);
 
 int maildir_find_mailboxes(struct mail_storage *storage, const char *mask,
-			   MailboxFunc func, void *context);
+			   mailbox_list_callback_t callback, void *context);
 int maildir_find_subscribed(struct mail_storage *storage, const char *mask,
-			    MailboxFunc func, void *context);
+			    mailbox_list_callback_t callback, void *context);
 
 int maildir_expunge_locked(struct index_mailbox *ibox, int notify);