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

prefer DECL_INIT_SVARS over DECL_SVARS+INIT_SVARS

Browse Source 
... as a result of relying on C99+.
This commit is contained in:
Oswald Buddenhagen 2022-05-11 12:56:16 +02:00
parent 6bfffa177a
commit 9e0efd409a
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sync.c
View File

@ -240,11 +240,9 @@ check_cancel( sync_vars_t *svars )
static int static int
check_ret( int sts, void *aux ) check_ret( int sts, void *aux )
{ {
DECL_SVARS;
if (sts == DRV_CANCELED) if (sts == DRV_CANCELED)
return 1; return 1;
INIT_SVARS(aux); DECL_INIT_SVARS(aux);
if (sts == DRV_BOX_BAD) { if (sts == DRV_BOX_BAD) {
svars->ret |= SYNC_FAIL; svars->ret |= SYNC_FAIL;
cancel_sync( svars ); cancel_sync( svars );
@ -254,27 +252,24 @@ check_ret( int sts, void *aux )
} }
#define SVARS_CHECK_RET \ #define SVARS_CHECK_RET \
DECL_SVARS; \
if (check_ret( sts, aux )) \ if (check_ret( sts, aux )) \
return; \ return; \
INIT_SVARS(aux) DECL_INIT_SVARS(aux)
#define SVARS_CHECK_RET_VARS(type) \ #define SVARS_CHECK_RET_VARS(type) \
type *vars = (type *)aux; \ type *vars = (type *)aux; \
DECL_SVARS; \
if (check_ret( sts, vars->aux )) { \ if (check_ret( sts, vars->aux )) { \
free( vars ); \ free( vars ); \
return; \ return; \
} \ } \
INIT_SVARS(vars->aux) DECL_INIT_SVARS(vars->aux)
#define SVARS_CHECK_CANCEL_RET \ #define SVARS_CHECK_CANCEL_RET \
DECL_SVARS; \
if (sts == SYNC_CANCELED) { \ if (sts == SYNC_CANCELED) { \
free( vars ); \ free( vars ); \
return; \ return; \
} \ } \
INIT_SVARS(vars->aux) DECL_INIT_SVARS(vars->aux)
static void static void
message_expunged( message_t *msg, void *aux ) message_expunged( message_t *msg, void *aux )
@ -376,11 +371,9 @@ sync_boxes( store_t *ctx[], const char * const names[], int present[], channel_c
static void static void
box_confirmed( int sts, uint uidvalidity, void *aux ) box_confirmed( int sts, uint uidvalidity, void *aux )
{ {
DECL_SVARS;
if (sts == DRV_CANCELED) if (sts == DRV_CANCELED)
return; return;
INIT_SVARS(aux); DECL_INIT_SVARS(aux);
if (check_cancel( svars )) if (check_cancel( svars ))
return; return;
@ -467,11 +460,9 @@ box_created( int sts, void *aux )
static void static void
box_opened( int sts, uint uidvalidity, void *aux ) box_opened( int sts, uint uidvalidity, void *aux )
{ {
DECL_SVARS;
if (sts == DRV_CANCELED) if (sts == DRV_CANCELED)
return; return;
INIT_SVARS(aux); DECL_INIT_SVARS(aux);
if (check_cancel( svars )) if (check_cancel( svars ))
return; return;