[dovecot-cvs] dovecot/src/lib-storage/subscription-file subscription-file.c,1.13,1.14 subscription-file.h,1.2,1.3

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage/subscription-file
In directory danu:/tmp/cvs-serv25916/src/lib-storage/subscription-file

Modified Files:
	subscription-file.c subscription-file.h 
Log Message:
Naming style changes, finally got tired of most of the typedefs. Also the
previous enum -> macro change reverted so that we don't use the highest bit
anymore, that's incompatible with old indexes so they will be rebuilt.



Index: subscription-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/subscription-file/subscription-file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- subscription-file.c	18 Dec 2002 15:15:41 -0000	1.13
+++ subscription-file.c	5 Jan 2003 13:09:53 -0000	1.14
@@ -15,8 +15,8 @@
 
 #define SUBSCRIPTION_FILE_NAME ".subscriptions"
 
-static int subsfile_set_syscall_error(MailStorage *storage, const char *path,
-				      const char *function)
+static int subsfile_set_syscall_error(struct mail_storage *storage,
+				      const char *path, const char *function)
 {
 	i_assert(function != NULL);
 
@@ -26,7 +26,7 @@
 	return FALSE;
 }
 
-static int subscription_open(MailStorage *storage, int update,
+static int subscription_open(struct mail_storage *storage, int update,
 			     const char **path, void **mmap_base,
 			     size_t *mmap_length)
 {
@@ -66,8 +66,9 @@
 	return fd;
 }
 
-static int subscription_append(MailStorage *storage, int fd, const char *name,
-			       size_t len, int prefix_lf, const char *path)
+static int subscription_append(struct mail_storage *storage, int fd,
+			       const char *name, size_t len, int prefix_lf,
+			       const char *path)
 {
 	char *buf;
 
@@ -95,7 +96,8 @@
 	return TRUE;
 }
 
-int subsfile_set_subscribed(MailStorage *storage, const char *name, int set)
+int subsfile_set_subscribed(struct mail_storage *storage,
+			    const char *name, int set)
 {
 	void *mmap_base;
 	size_t mmap_length;
@@ -167,10 +169,10 @@
 	return !failed;
 }
 
-int subsfile_foreach(MailStorage *storage, const char *mask,
+int subsfile_foreach(struct mail_storage *storage, const char *mask,
 		     SubsFileForeachFunc func, void *context)
 {
-        ImapMatchGlob *glob;
+        struct imap_match_glob *glob;
 	const char *path, *start, *end, *p, *line;
 	void *mmap_base;
 	size_t mmap_length;

Index: subscription-file.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/subscription-file/subscription-file.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- subscription-file.h	22 Aug 2002 12:48:38 -0000	1.2
+++ subscription-file.h	5 Jan 2003 13:09:53 -0000	1.3
@@ -4,13 +4,14 @@
 #include "mail-storage.h"
 
 /* Returns FALSE if foreach should be aborted */
-typedef int (*SubsFileForeachFunc)(MailStorage *storage, const char *name,
-				   void *context);
+typedef int (*SubsFileForeachFunc)(struct mail_storage *storage,
+				   const char *name, void *context);
 
-int subsfile_set_subscribed(MailStorage *storage, const char *name, int set);
+int subsfile_set_subscribed(struct mail_storage *storage,
+			    const char *name, int set);
 
 /* Returns -1 if error, 0 if foreach function returned FALSE or 1 if all ok */
-int subsfile_foreach(MailStorage *storage, const char *mask,
+int subsfile_foreach(struct mail_storage *storage, const char *mask,
 		     SubsFileForeachFunc func, void *context);
 
 #endif