isync

commit f4240761f162ab9693c3bb64bca4bc22f411f911
parent 74c78c70b973f95d4e9150e4da8284c01aa22b69
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Sun, 15 Feb 2015 11:38:26 +0100

introduce and use pending_wakeup()

so we don't need to peek into internal data structures.

Diffstat:
M
src/common.h
 | 
1
+
M
src/drv_maildir.c
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/common.h b/src/common.h
@@ -164,6 +164,7 @@ typedef struct {
 void init_wakeup( wakeup_t *tmr, void (*cb)( void * ), void *aux );
 void conf_wakeup( wakeup_t *tmr, int timeout );
 void wipe_wakeup( wakeup_t *tmr );
+static INLINE int pending_wakeup( wakeup_t *tmr ) { return tmr->links.next != 0; }
 
 void main_loop( void );
 
diff --git a/src/drv_maildir.c b/src/drv_maildir.c
@@ -529,7 +529,7 @@ maildir_uidval_lock( maildir_store_t *ctx )
 #endif
 	char buf[128];
 
-	if (ctx->lcktmr.links.next) {
+	if (pending_wakeup( &ctx->lcktmr )) {
 		/* The unlock timer is active, so we are obviously already locked. */
 		return DRV_OK;
 	}