lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop unused 'flags' parameter of maildir_list_{recurse,inbox,path}()

Browse Source 
amends 416ced25.
This commit is contained in:
Oswald Buddenhagen 2022-06-07 12:08:50 +02:00
parent 46584e5358
commit 090ba0caa3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drv_maildir.c
View File

@ -373,7 +373,7 @@ maildir_list_maildirpp( maildir_store_t *ctx, int flags, const char *inbox )
} }
static int static int
maildir_list_recurse( maildir_store_t *ctx, int isBox, int flags, maildir_list_recurse( maildir_store_t *ctx, int isBox,
const char *inbox, uint inboxLen, const char *inbox, uint inboxLen,
char *suffix, int suffixLen, char *suffix, int suffixLen,
char *path, int pathLen, char *name, int nameLen ) char *path, int pathLen, char *name, int nameLen )
@ -449,7 +449,7 @@ maildir_list_recurse( maildir_store_t *ctx, int isBox, int flags,
add_string_list( &ctx->boxes, name ); add_string_list( &ctx->boxes, name );
path[pl] = 0; path[pl] = 0;
name[nl++] = '/'; name[nl++] = '/';
if (maildir_list_recurse( ctx, isBox + 1, flags, inbox, inboxLen, NULL, 0, path, pl, name, nl ) < 0) { if (maildir_list_recurse( ctx, isBox + 1, inbox, inboxLen, NULL, 0, path, pl, name, nl ) < 0) {
closedir( dir ); closedir( dir );
return -1; return -1;
} }
@ -460,7 +460,7 @@ maildir_list_recurse( maildir_store_t *ctx, int isBox, int flags,
} }
static int static int
maildir_list_inbox( maildir_store_t *ctx, int flags ) maildir_list_inbox( maildir_store_t *ctx )
{ {
char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX];
@ -470,13 +470,13 @@ maildir_list_inbox( maildir_store_t *ctx, int flags )
add_string_list( &ctx->boxes, "INBOX" ); add_string_list( &ctx->boxes, "INBOX" );
return maildir_list_recurse( return maildir_list_recurse(
ctx, 1, flags, NULL, 0, NULL, 0, ctx, 1, NULL, 0, NULL, 0,
path, nfsnprintf( path, _POSIX_PATH_MAX, "%s/", ctx->conf->inbox ), path, nfsnprintf( path, _POSIX_PATH_MAX, "%s/", ctx->conf->inbox ),
name, nfsnprintf( name, _POSIX_PATH_MAX, "INBOX/" ) ); name, nfsnprintf( name, _POSIX_PATH_MAX, "INBOX/" ) );
} }
static int static int
maildir_list_path( maildir_store_t *ctx, int flags ) maildir_list_path( maildir_store_t *ctx )
{ {
char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX], name[_POSIX_PATH_MAX];
@ -488,7 +488,7 @@ maildir_list_path( maildir_store_t *ctx, int flags )
return -1; return -1;
const char *inbox = ctx->conf->inbox; const char *inbox = ctx->conf->inbox;
return maildir_list_recurse( return maildir_list_recurse(
ctx, 0, flags, inbox, strlen( inbox ), ctx, 0, inbox, strlen( inbox ),
ctx->conf->path_sfx, strlen( ctx->conf->path_sfx ), ctx->conf->path_sfx, strlen( ctx->conf->path_sfx ),
path, nfsnprintf( path, _POSIX_PATH_MAX, "%s/", ctx->conf->path ), path, nfsnprintf( path, _POSIX_PATH_MAX, "%s/", ctx->conf->path ),
name, 0 ); name, 0 );
@ -504,9 +504,9 @@ maildir_list_store( store_t *gctx, int flags,
if (conf->sub_style == SUB_MAILDIRPP if (conf->sub_style == SUB_MAILDIRPP
? maildir_list_maildirpp( ctx, flags, conf->inbox ) < 0 ? maildir_list_maildirpp( ctx, flags, conf->inbox ) < 0
: ((((flags & LIST_PATH) || ((flags & LIST_PATH_MAYBE) && conf->path)) : ((((flags & LIST_PATH) || ((flags & LIST_PATH_MAYBE) && conf->path))
&& maildir_list_path( ctx, flags ) < 0) || && maildir_list_path( ctx ) < 0) ||
((flags & LIST_INBOX) ((flags & LIST_INBOX)
&& maildir_list_inbox( ctx, flags ) < 0))) { && maildir_list_inbox( ctx ) < 0))) {
maildir_invoke_bad_callback( ctx ); maildir_invoke_bad_callback( ctx );
cb( DRV_CANCELED, NULL, aux ); cb( DRV_CANCELED, NULL, aux );
} else { } else {