Mercurial > dovecot > core-2.2

changeset 3470:346a494c2feb HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved array declaration to array-decl.h and include it in lib.h. So array.h needs to be now included to use any array_*() functions.
author Timo Sirainen <tss@iki.fi>
date Mon, 04 Jul 2005 14:32:13 +0300
parents 7e39590da48a
children 138e242c53c9
files src/auth/auth-client-connection.c src/auth/auth-master-connection.c src/auth/auth-master-listener.c src/imap/commands-util.c src/imap/imap-fetch.c src/lib-index/mail-cache-lookup.c src/lib-index/mail-cache-transaction.c src/lib-index/mail-cache.c src/lib-index/mail-index-sync-ext.c src/lib-index/mail-index-sync-keywords.c src/lib-index/mail-index-sync-update.c src/lib-index/mail-index-sync.c src/lib-index/mail-index-transaction-view.c src/lib-index/mail-index-transaction.c src/lib-index/mail-index-view-sync.c src/lib-index/mail-index-view.c src/lib-index/mail-index.c src/lib-index/mail-transaction-log-append.c src/lib-storage/index/index-mail-headers.c src/lib-storage/index/index-mail.c src/lib-storage/index/index-storage.c src/lib-storage/index/maildir/maildir-copy.c src/lib-storage/index/maildir/maildir-keywords.c src/lib-storage/index/maildir/maildir-save.c src/lib-storage/index/maildir/maildir-sync.c src/lib-storage/index/mbox/mbox-save.c src/lib-storage/index/mbox/mbox-sync-parse.c src/lib-storage/index/mbox/mbox-sync-rewrite.c src/lib-storage/index/mbox/mbox-sync-update.c src/lib-storage/index/mbox/mbox-sync.c src/lib-storage/mail-storage.c src/lib/array-decl.h src/lib/array.h src/lib/lib.h src/master/mail-process.c
diffstat 35 files changed, 65 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/auth-client-connection.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/auth/auth-client-connection.c	Mon Jul 04 14:32:13 2005 +0300
@@ -5,6 +5,7 @@
 #include "istream.h"
 #include "ostream.h"
 #include "network.h"
+#include "array.h"
 #include "str.h"
 #include "safe-memset.h"
 #include "auth-request-handler.h"
--- a/src/auth/auth-master-connection.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/auth/auth-master-connection.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "common.h"
+#include "array.h"
 #include "buffer.h"
 #include "hash.h"
 #include "str.h"
--- a/src/auth/auth-master-listener.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/auth/auth-master-listener.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2005 Timo Sirainen */
 
 #include "common.h"
+#include "array.h"
 #include "ioloop.h"
 #include "network.h"
 #include "istream.h"
--- a/src/imap/commands-util.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/imap/commands-util.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002-2003 Timo Sirainen */
 
 #include "common.h"
+#include "array.h"
 #include "buffer.h"
 #include "str.h"
 #include "mail-storage.h"
--- a/src/imap/imap-fetch.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/imap/imap-fetch.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002-2004 Timo Sirainen */
 
 #include "common.h"
+#include "array.h"
 #include "buffer.h"
 #include "istream.h"
 #include "ostream.h"
--- a/src/lib-index/mail-cache-lookup.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-cache-lookup.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2003-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "str.h"
 #include "mail-cache-private.h"
--- a/src/lib-index/mail-cache-transaction.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-cache-transaction.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2003-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "file-cache.h"
 #include "file-set-size.h"
--- a/src/lib-index/mail-cache.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-cache.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2003-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "hash.h"
 #include "file-cache.h"
--- a/src/lib-index/mail-index-sync-ext.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-sync-ext.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "mail-index-view-private.h"
 #include "mail-index-sync-private.h"
--- a/src/lib-index/mail-index-sync-keywords.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-sync-keywords.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "mail-index-view-private.h"
 #include "mail-index-sync-private.h"
--- a/src/lib-index/mail-index-sync-update.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-sync-update.c	Mon Jul 04 14:32:13 2005 +0300
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
 #include "buffer.h"
 #include "file-set-size.h"
 #include "mmap-util.h"
--- a/src/lib-index/mail-index-sync.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-sync.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2003-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "mail-index-view-private.h"
 #include "mail-index-sync-private.h"
--- a/src/lib-index/mail-index-transaction-view.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-transaction-view.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "mail-index-private.h"
 #include "mail-index-view-private.h"
--- a/src/lib-index/mail-index-transaction.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-transaction.c	Mon Jul 04 14:32:13 2005 +0300
@@ -5,6 +5,7 @@
    UIDs. This is because we're able to compress sequence ranges better. */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "mail-index-view-private.h"
 #include "mail-transaction-log.h"
--- a/src/lib-index/mail-index-view-sync.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-view-sync.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2003-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "mail-index-view-private.h"
 #include "mail-index-sync-private.h"
--- a/src/lib-index/mail-index-view.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index-view.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2003-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "mail-index-view-private.h"
 #include "mail-transaction-log.h"
--- a/src/lib-index/mail-index.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-index.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2003-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "hash.h"
 #include "mmap-util.h"
--- a/src/lib-index/mail-transaction-log-append.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-index/mail-transaction-log-append.c	Mon Jul 04 14:32:13 2005 +0300
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
 #include "buffer.h"
 #include "write-full.h"
 #include "mail-index-private.h"
--- a/src/lib-storage/index/index-mail-headers.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/index-mail-headers.c	Mon Jul 04 14:32:13 2005 +0300
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "istream.h"
+#include "array.h"
 #include "buffer.h"
 #include "str.h"
 #include "message-date.h"
--- a/src/lib-storage/index/index-mail.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/index-mail.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002-2003 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "istream.h"
 #include "hex-binary.h"
--- a/src/lib-storage/index/index-storage.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/index-storage.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002-2003 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "ioloop.h"
 #include "mail-index.h"
--- a/src/lib-storage/index/maildir/maildir-copy.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/maildir/maildir-copy.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002-2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "ioloop.h"
 #include "maildir-storage.h"
 #include "index-mail.h"
--- a/src/lib-storage/index/maildir/maildir-keywords.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/maildir/maildir-keywords.c	Mon Jul 04 14:32:13 2005 +0300
@@ -5,6 +5,7 @@
    that would be racy otherwise. */
 
 #include "lib.h"
+#include "array.h"
 #include "ioloop.h"
 #include "hash.h"
 #include "str.h"
--- a/src/lib-storage/index/maildir/maildir-save.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/maildir/maildir-save.c	Mon Jul 04 14:32:13 2005 +0300
@@ -2,6 +2,8 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
+#include "buffer.h"
 #include "ostream.h"
 #include "ostream-crlf.h"
 #include "str.h"
--- a/src/lib-storage/index/maildir/maildir-sync.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/maildir/maildir-sync.c	Mon Jul 04 14:32:13 2005 +0300
@@ -172,6 +172,7 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
 #include "buffer.h"
 #include "hash.h"
 #include "str.h"
--- a/src/lib-storage/index/mbox/mbox-save.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-save.c	Mon Jul 04 14:32:13 2005 +0300
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
 #include "hostpid.h"
 #include "istream.h"
 #include "ostream.h"
--- a/src/lib-storage/index/mbox/mbox-sync-parse.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-sync-parse.c	Mon Jul 04 14:32:13 2005 +0300
@@ -5,6 +5,7 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
 #include "buffer.h"
 #include "istream.h"
 #include "str.h"
--- a/src/lib-storage/index/mbox/mbox-sync-rewrite.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-sync-rewrite.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,4 +1,7 @@
+/* Copyright (C) 2004-2005 Timo Sirainen */
+
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "istream.h"
 #include "ostream.h"
--- a/src/lib-storage/index/mbox/mbox-sync-update.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-sync-update.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2004 Timo Sirainen */
 
 #include "lib.h"
+#include "array.h"
 #include "buffer.h"
 #include "str.h"
 #include "message-parser.h"
--- a/src/lib-storage/index/mbox/mbox-sync.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-sync.c	Mon Jul 04 14:32:13 2005 +0300
@@ -33,6 +33,7 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
 #include "buffer.h"
 #include "hostpid.h"
 #include "istream.h"
--- a/src/lib-storage/mail-storage.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib-storage/mail-storage.c	Mon Jul 04 14:32:13 2005 +0300
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "ioloop.h"
+#include "array.h"
 #include "mail-storage-private.h"
 
 #include <stdlib.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib/array-decl.h	Mon Jul 04 14:32:13 2005 +0300
@@ -0,0 +1,27 @@
+#ifndef __ARRAY_DECL_H
+#define __ARRAY_DECL_H
+
+#if defined (DEBUG) && defined (__GNUC__)
+#  define ARRAY_TYPE_CHECKS
+#endif
+
+#ifdef ARRAY_TYPE_CHECKS
+#  define ARRAY_DEFINE(name, array_type) name; array_type *name ## __ ## type
+#  define ARRAY_DEFINE_EXTERN(name, array_type) \
+	name; extern array_type *name ## __ ## type
+#  define ARRAY_DEFINE_PTR(name, array_type) \
+	name; array_type **name ## __ ## type
+#  define ARRAY_INIT { 0, 0 }, 0
+#else
+#  define ARRAY_DEFINE(name, array_type) name
+#  define ARRAY_DEFINE_EXTERN(name, array_type) name
+#  define ARRAY_DEFINE_PTR(name, array_type) name
+#  define ARRAY_INIT { 0, 0 }
+#endif
+
+struct array {
+	buffer_t *buffer;
+	size_t element_size;
+};
+
+#endif
--- a/src/lib/array.h	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib/array.h	Mon Jul 04 14:32:13 2005 +0300
@@ -1,8 +1,6 @@
 #ifndef __ARRAY_H
 #define __ARRAY_H
 
-#include "buffer.h"
-
 /* Array is a buffer accessible using fixed size elements. If DEBUG is
    enabled, it also provides compile time type safety:
 
@@ -35,27 +33,17 @@
 	struct foo *foo = array_idx(bars, 0);
    }
 */
-#if defined (DEBUG) && defined (__GNUC__)
-#  define ARRAY_TYPE_CHECKS
-#endif
+#include "array-decl.h"
+#include "buffer.h"
 
 #ifdef ARRAY_TYPE_CHECKS
-#  define ARRAY_DEFINE(name, array_type) name; array_type *name ## __ ## type
-#  define ARRAY_DEFINE_EXTERN(name, array_type) \
-	name; extern array_type *name ## __ ## type
-#  define ARRAY_DEFINE_PTR(name, array_type) \
-	name; array_type **name ## __ ## type
 #  define ARRAY_CREATE(array, pool, array_type, init_count) STMT_START { \
 	array_type **_array_tmp = array ## __ ## type; _array_tmp = NULL; \
 	array_create(array, pool, sizeof(array_type), init_count); \
 	} STMT_END
 #  define ARRAY_SET_TYPE(array, array_type) \
 	array_type **array ## __ ## type = NULL
-#  define ARRAY_INIT { 0, 0 }, 0
 #else
-#  define ARRAY_DEFINE(name, array_type) name
-#  define ARRAY_DEFINE_EXTERN(name, array_type) name
-#  define ARRAY_DEFINE_PTR(name, array_type) name
 #  define ARRAY_CREATE(array, pool, array_type, init_count) \
 	array_create(array, pool, sizeof(array_type), init_count)
 /* The reason we do this for non-ARRAY_TYPE_CHECKS as well is because if we
@@ -67,14 +55,8 @@
    unused-attribute to get rid of that with gcc. */
 #  define ARRAY_SET_TYPE(array, array_type) \
 	array_type **array ## __ ## type __attr_unused__ = NULL
-#  define ARRAY_INIT { 0, 0 }
 #endif
 
-struct array {
-	buffer_t *buffer;
-	size_t element_size;
-};
-
 static inline void
 array_create_from_buffer(array_t *array, buffer_t *buffer, size_t element_size)
 {
--- a/src/lib/lib.h	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/lib/lib.h	Mon Jul 04 14:32:13 2005 +0300
@@ -35,7 +35,7 @@
 struct istream;
 struct ostream;
 
-#include "array.h" /* ARRAY_DEFINE()s may exist in any header */
+#include "array-decl.h" /* ARRAY_DEFINE()s may exist in any header */
 #include "strfuncs.h"
 
 extern unsigned char null4[4]; /* 4 zeros - useful for padding */
--- a/src/master/mail-process.c	Mon Jul 04 00:35:18 2005 +0300
+++ b/src/master/mail-process.c	Mon Jul 04 14:32:13 2005 +0300
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "common.h"
+#include "array.h"
 #include "fd-close-on-exec.h"
 #include "env-util.h"
 #include "str.h"