[dovecot-cvs] dovecot/src/lib-index/maildir maildir-build.c,1.17,1.18 maildir-index.c,1.20,1.21 maildir-index.h,1.12,1.13 maildir-open.c,1.13,1.14 maildir-rebuild.c,1.8,1.9 maildir-sync.c,1.23,1.24 maildir-update.c,1.14,1.15
cras at procontrol.fi
cras at procontrol.fi
Sun Jan 5 15:09:55 EET 2003
- Previous message: [dovecot-cvs] dovecot/src/lib-storage mail-search.c,1.7,1.8 mail-search.h,1.5,1.6 mail-sort.c,1.7,1.8 mail-sort.h,1.3,1.4 mail-storage.c,1.6,1.7 mail-storage.h,1.26,1.27
- Next message: [dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-copy.c,1.16,1.17 maildir-expunge.c,1.9,1.10 maildir-list.c,1.6,1.7 maildir-save.c,1.13,1.14 maildir-storage.c,1.21,1.22 maildir-storage.h,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/dovecot/src/lib-index/maildir
In directory danu:/tmp/cvs-serv25916/src/lib-index/maildir
Modified Files:
maildir-build.c maildir-index.c maildir-index.h maildir-open.c
maildir-rebuild.c maildir-sync.c maildir-update.c
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: maildir-build.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-build.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- maildir-build.c 19 Dec 2002 01:02:35 -0000 1.17
+++ maildir-build.c 5 Jan 2003 13:09:52 -0000 1.18
@@ -11,10 +11,11 @@
#include <dirent.h>
#include <sys/stat.h>
-static int maildir_index_append_fd(MailIndex *index, int fd, const char *fname)
+static int maildir_index_append_fd(struct mail_index *index,
+ int fd, const char *fname)
{
- MailIndexRecord *rec;
- MailIndexUpdate *update;
+ struct mail_index_record *rec;
+ struct mail_index_update *update;
struct stat st;
uoff_t virtual_size;
const char *p;
@@ -71,7 +72,7 @@
return index->append_end(index, rec);
}
-int maildir_index_append_file(MailIndex *index, const char *dir,
+int maildir_index_append_file(struct mail_index *index, const char *dir,
const char *fname)
{
const char *path;
@@ -100,7 +101,7 @@
return ret;
}
-int maildir_index_build_dir(MailIndex *index, const char *source_dir,
+int maildir_index_build_dir(struct mail_index *index, const char *source_dir,
const char *dest_dir)
{
DIR *dirp;
Index: maildir-index.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-index.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- maildir-index.c 21 Dec 2002 22:02:58 -0000 1.20
+++ maildir-index.c 5 Jan 2003 13:09:52 -0000 1.21
@@ -9,12 +9,13 @@
#include <stdio.h>
#include <sys/stat.h>
-extern MailIndex maildir_index;
+extern struct mail_index maildir_index;
-MailFlags maildir_filename_get_flags(const char *fname, MailFlags default_flags)
+enum mail_flags maildir_filename_get_flags(const char *fname,
+ enum mail_flags default_flags)
{
const char *info;
- MailFlags flags;
+ enum mail_flags flags;
info = strchr(fname, ':');
if (info == NULL || info[1] != '2' || info[2] != ',')
@@ -54,9 +55,9 @@
return flags;
}
-const char *maildir_filename_set_flags(const char *fname, MailFlags flags)
+const char *maildir_filename_set_flags(const char *fname, enum mail_flags flags)
{
- String *flags_str;
+ string_t *flags_str;
const char *info, *oldflags;
int i, nextflag;
@@ -133,22 +134,22 @@
return str_c(flags_str);
}
-MailIndex *maildir_index_alloc(const char *dir, const char *maildir)
+struct mail_index *maildir_index_alloc(const char *dir, const char *maildir)
{
- MailIndex *index;
+ struct mail_index *index;
i_assert(dir != NULL);
i_assert(maildir != NULL);
- index = i_new(MailIndex, 1);
- memcpy(index, &maildir_index, sizeof(MailIndex));
+ index = i_new(struct mail_index, 1);
+ memcpy(index, &maildir_index, sizeof(struct mail_index));
index->mailbox_path = i_strdup(maildir);
mail_index_init(index, dir);
return index;
}
-static void maildir_index_free(MailIndex *index)
+static void maildir_index_free(struct mail_index *index)
{
mail_index_close(index);
i_free(index->dir);
@@ -156,7 +157,8 @@
i_free(index);
}
-static time_t maildir_get_internal_date(MailIndex *index, MailIndexRecord *rec)
+static time_t maildir_get_internal_date(struct mail_index *index,
+ struct mail_index_record *rec)
{
struct stat st;
const char *fname;
@@ -183,11 +185,12 @@
return st.st_mtime;
}
-static int maildir_index_update_flags(MailIndex *index, MailIndexRecord *rec,
- unsigned int seq, MailFlags flags,
+static int maildir_index_update_flags(struct mail_index *index,
+ struct mail_index_record *rec,
+ unsigned int seq, enum mail_flags flags,
int external_change)
{
- MailIndexUpdate *update;
+ struct mail_index_update *update;
const char *old_fname, *new_fname;
const char *old_path, *new_path;
@@ -232,7 +235,7 @@
return TRUE;
}
-MailIndex maildir_index = {
+struct mail_index maildir_index = {
mail_index_open,
mail_index_open_or_create,
maildir_index_free,
Index: maildir-index.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-index.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- maildir-index.h 20 Dec 2002 07:53:52 -0000 1.12
+++ maildir-index.h 5 Jan 2003 13:09:52 -0000 1.13
@@ -6,23 +6,27 @@
/* ":2,DFRST" - leave the 2 extra for other clients' additions */
#define MAILDIR_LOCATION_EXTRA_SPACE 10
-MailIndex *maildir_index_alloc(const char *dir, const char *maildir);
+struct mail_index *maildir_index_alloc(const char *dir, const char *maildir);
-MailFlags maildir_filename_get_flags(const char *fname,
- MailFlags default_flags);
-const char *maildir_filename_set_flags(const char *fname, MailFlags flags);
+enum mail_flags maildir_filename_get_flags(const char *fname,
+ enum mail_flags default_flags);
+const char *maildir_filename_set_flags(const char *fname,
+ enum mail_flags flags);
-int maildir_index_rebuild(MailIndex *index);
-int maildir_index_sync(MailIndex *index, MailLockType lock_type, int *changes);
+int maildir_index_rebuild(struct mail_index *index);
+int maildir_index_sync(struct mail_index *index,
+ enum mail_lock_type lock_type, int *changes);
-int maildir_index_append_file(MailIndex *index, const char *dir,
+int maildir_index_append_file(struct mail_index *index, const char *dir,
const char *fname);
-int maildir_index_build_dir(MailIndex *index, const char *source_dir,
+int maildir_index_build_dir(struct mail_index *index, const char *source_dir,
const char *dest_dir);
-IStream *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
- time_t *internal_date, int *deleted);
+struct istream *maildir_open_mail(struct mail_index *index,
+ struct mail_index_record *rec,
+ time_t *internal_date, int *deleted);
-int maildir_record_update(MailIndex *index, MailIndexUpdate *update, int fd);
+int maildir_record_update(struct mail_index *index,
+ struct mail_index_update *update, int fd);
#endif
Index: maildir-open.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-open.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- maildir-open.c 20 Dec 2002 07:53:52 -0000 1.13
+++ maildir-open.c 5 Jan 2003 13:09:52 -0000 1.14
@@ -10,8 +10,9 @@
#include <fcntl.h>
#include <sys/stat.h>
-IStream *maildir_open_mail(MailIndex *index, MailIndexRecord *rec,
- time_t *internal_date, int *deleted)
+struct istream *maildir_open_mail(struct mail_index *index,
+ struct mail_index_record *rec,
+ time_t *internal_date, int *deleted)
{
struct stat st;
const char *fname, *path;
Index: maildir-rebuild.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-rebuild.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- maildir-rebuild.c 20 Dec 2002 07:53:52 -0000 1.8
+++ maildir-rebuild.c 5 Jan 2003 13:09:52 -0000 1.9
@@ -9,7 +9,7 @@
#include <sys/stat.h>
#include <sys/mman.h>
-int maildir_index_rebuild(MailIndex *index)
+int maildir_index_rebuild(struct mail_index *index)
{
struct stat st;
const char *cur_dir, *new_dir;
@@ -31,7 +31,8 @@
index->indexid = index->header->indexid;
index->inconsistent = TRUE;
- if (msync(index->mmap_base, sizeof(MailIndexHeader), MS_SYNC) < 0)
+ if (msync(index->mmap_base,
+ sizeof(struct mail_index_header), MS_SYNC) < 0)
return FALSE;
/* reset data file */
Index: maildir-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-sync.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- maildir-sync.c 2 Jan 2003 09:34:01 -0000 1.23
+++ maildir-sync.c 5 Jan 2003 13:09:52 -0000 1.24
@@ -14,12 +14,13 @@
#include <utime.h>
#include <sys/stat.h>
-static int maildir_index_sync_file(MailIndex *index, MailIndexRecord *rec,
+static int maildir_index_sync_file(struct mail_index *index,
+ struct mail_index_record *rec,
unsigned int seq, const char *fname,
const char *path, int fname_changed)
{
- MailIndexUpdate *update;
- MailFlags flags;
+ struct mail_index_update *update;
+ enum mail_flags flags;
int failed;
i_assert(fname != NULL);
@@ -48,11 +49,12 @@
return !failed;
}
-static int maildir_index_sync_files(MailIndex *index, const char *dir,
- HashTable *files, int check_content_changes)
+static int maildir_index_sync_files(struct mail_index *index, const char *dir,
+ struct hash_table *files,
+ int check_content_changes)
{
- MailIndexRecord *rec;
- MailIndexDataRecordHeader *data_hdr;
+ struct mail_index_record *rec;
+ struct mail_index_data_record_header *data_hdr;
struct stat st;
const char *fname, *base_fname, *value;
char path[PATH_MAX];
@@ -144,16 +146,16 @@
return TRUE;
}
-typedef struct {
- MailIndex *index;
+struct hash_append_context {
+ struct mail_index *index;
const char *dir;
int failed;
-} HashAppendContext;
+};
static void maildir_index_hash_append_file(void *key __attr_unused__,
void *value, void *context)
{
- HashAppendContext *ctx = context;
+ struct hash_append_context *ctx = context;
t_push();
if (!maildir_index_append_file(ctx->index, ctx->dir, value)) {
@@ -163,10 +165,10 @@
t_pop();
}
-static int maildir_index_append_files(MailIndex *index, const char *dir,
- HashTable *files)
+static int maildir_index_append_files(struct mail_index *index, const char *dir,
+ struct hash_table *files)
{
- HashAppendContext ctx;
+ struct hash_append_context ctx;
ctx.failed = FALSE;
ctx.index = index;
@@ -176,10 +178,10 @@
return !ctx.failed;
}
-static int maildir_index_sync_dir(MailIndex *index, const char *dir)
+static int maildir_index_sync_dir(struct mail_index *index, const char *dir)
{
- Pool pool;
- HashTable *files;
+ pool_t pool;
+ struct hash_table *files;
DIR *dirp;
struct dirent *d;
char *key, *value, *p;
@@ -250,8 +252,8 @@
return !failed;
}
-int maildir_index_sync(MailIndex *index,
- MailLockType data_lock_type __attr_unused__,
+int maildir_index_sync(struct mail_index *index,
+ enum mail_lock_type data_lock_type __attr_unused__,
int *changes)
{
struct stat sti, std;
Index: maildir-update.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/maildir/maildir-update.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- maildir-update.c 6 Dec 2002 01:09:23 -0000 1.14
+++ maildir-update.c 5 Jan 2003 13:09:52 -0000 1.15
@@ -4,10 +4,11 @@
#include "istream.h"
#include "maildir-index.h"
-int maildir_record_update(MailIndex *index, MailIndexUpdate *update, int fd)
+int maildir_record_update(struct mail_index *index,
+ struct mail_index_update *update, int fd)
{
- IStream *input;
- MailDataField cache_fields;
+ struct istream *input;
+ enum mail_data_field cache_fields;
/* don't even bother opening the file if we're not going to do
anything */
- Previous message: [dovecot-cvs] dovecot/src/lib-storage mail-search.c,1.7,1.8 mail-search.h,1.5,1.6 mail-sort.c,1.7,1.8 mail-sort.h,1.3,1.4 mail-storage.c,1.6,1.7 mail-storage.h,1.26,1.27
- Next message: [dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-copy.c,1.16,1.17 maildir-expunge.c,1.9,1.10 maildir-list.c,1.6,1.7 maildir-save.c,1.13,1.14 maildir-storage.c,1.21,1.22 maildir-storage.h,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the dovecot-cvs
mailing list