CVS commit by ossi: 

split driver->prepare into ->prepare_opts and ->prepare_paths


  M +8 -2      drv_imap.c   1.13
  M +8 -2      drv_maildir.c   1.9
  M +2 -1      isync.h   1.45
  M +2 -1      sync.c   1.52


--- isync/src/drv_imap.c  #1.12:1.13
@@ -1399,8 +1399,13 @@ imap_open_store( store_conf_t *conf, sto
 
 static void
-imap_prepare( store_t *gctx, int opts )
+imap_prepare_paths( store_t *gctx )
 {
        free_generic_messages( gctx->msgs );
        gctx->msgs = 0;
+}
+
+static void
+imap_prepare_opts( store_t *gctx, int opts )
+{
        gctx->opts = opts;
 }
@@ -1813,5 +1818,6 @@ struct driver imap_driver = {
        imap_close_store,
        imap_list,
-       imap_prepare,
+       imap_prepare_paths,
+       imap_prepare_opts,
        imap_select,
        imap_fetch_msg,

--- isync/src/drv_maildir.c  #1.8:1.9
@@ -704,5 +704,5 @@ maildir_app_msg( maildir_store_t *ctx, m
 
 static void
-maildir_prepare( store_t *gctx, int opts )
+maildir_prepare_paths( store_t *gctx )
 {
        maildir_store_t *ctx = (maildir_store_t *)gctx;
@@ -718,4 +718,9 @@ maildir_prepare( store_t *gctx, int opts
        else
                nfasprintf( &gctx->path, "%s%s", gctx->conf->path, gctx->name );
+}
+
+static void
+maildir_prepare_opts( store_t *gctx, int opts )
+{
        if (opts & OPEN_SETFLAGS)
                opts |= OPEN_OLD;
@@ -1189,5 +1194,6 @@ struct driver maildir_driver = {
        maildir_close_store,
        maildir_list,
-       maildir_prepare,
+       maildir_prepare_paths,
+       maildir_prepare_opts,
        maildir_select,
        maildir_fetch_msg,

--- isync/src/isync.h  #1.44:1.45
@@ -172,5 +172,6 @@ struct driver {
        void (*close_store)( store_t *ctx );
        int (*list)( store_t *ctx, string_list_t **boxes );
-       void (*prepare)( store_t *ctx, int opts );
+       void (*prepare_paths)( store_t *ctx );
+       void (*prepare_opts)( store_t *ctx, int opts );
        int (*select)( store_t *ctx, int minuid, int maxuid, int *excs, int 
nexcs );
        int (*fetch_msg)( store_t *ctx, message_t *msg, msg_data_t *data );

--- isync/src/sync.c  #1.51:1.52
@@ -237,5 +237,6 @@ sync_boxes( store_t *ctx[], const char *
                ctx[t]->uidvalidity = 0;
                driver[t] = ctx[t]->conf->driver;
-               driver[t]->prepare( ctx[t], opts[t] );
+               driver[t]->prepare_paths( ctx[t] );
+               driver[t]->prepare_opts( ctx[t], opts[t] );
        }
 




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel

Reply via email to