commit 076f45686c9c14af3c504867a9a27d2ad9d8aad7
Author: Oswald Buddenhagen <[email protected]>
Date: Sun Apr 10 01:17:31 2011 +0200
use -1 instead of 1 as error indicator
that's more intuitive as it reflects POSIX file i/o.
src/sync.c | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/sync.c b/src/sync.c
index 9b8a025..e09dec9 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -422,15 +422,15 @@ check_ret( int sts, sync_vars_t *svars, int t )
{
switch (sts) {
case DRV_CANCELED:
- return 1;
+ return -1;
case DRV_STORE_BAD:
svars->ret |= SYNC_BAD(t);
cancel_sync( svars );
- return 1;
+ return -1;
case DRV_BOX_BAD:
svars->ret |= SYNC_FAIL;
cancel_sync( svars );
- return 1;
+ return -1;
}
return 0;
}
@@ -441,7 +441,7 @@ check_ret_aux( int sts, sync_vars_t *svars, int t, void
*aux )
if (!check_ret( sts, svars, t ))
return 0;
free( aux );
- return 1;
+ return -1;
}
@@ -843,13 +843,13 @@ box_selected( int sts, void *aux )
sync_rec_t *srec;
if (check_ret( sts, svars, t ))
- return 1;
+ return -1;
if (svars->uidval[t] >= 0 && svars->uidval[t] !=
svars->ctx[t]->uidvalidity) {
error( "Error: UIDVALIDITY of %s changed (got %d, expected
%d)\n",
str_ms[t], svars->ctx[t]->uidvalidity,
svars->uidval[t] );
svars->ret |= SYNC_FAIL;
cancel_sync( svars );
- return 1;
+ return -1;
}
info( "%s: %d messages, %d recent\n", str_ms[t], svars->ctx[t]->count,
svars->ctx[t]->recent );
@@ -873,7 +873,7 @@ box_selected( int sts, void *aux )
fv->aux = AUX;
fv->srec = srec;
if (svars->drv[t]->find_msg( svars->ctx[t],
srec->tuid, msg_found_sel, fv ))
- return 1;
+ return -1;
}
}
}
@@ -888,7 +888,7 @@ msg_found_sel( int sts, int uid, void *aux )
SVARS(vars->aux)
if (check_ret_aux( sts, svars, t, vars ))
- return 1;
+ return -1;
switch (sts) {
case DRV_OK:
debug( " -> new UID %d\n", uid );
@@ -1092,7 +1092,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
Fprintf( svars->jfp, "# %d %d
%." stringify(TUIDL) "s\n", srec->uid[M], srec->uid[S], srec->tuid );
debug( " -> %sing message,
TUID %." stringify(TUIDL) "s\n", str_hl[t], srec->tuid );
if (copy_msg( cv ))
- return 1;
+ return -1;
} else {
if (tmsg->srec) {
debug( " -> not %sing
- still too big\n", str_hl[t] );
@@ -1105,7 +1105,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
}
svars->state[t] |= ST_SENT_NEW;
if (msgs_copied( svars, t ))
- return 1;
+ return -1;
}
debug( "synchronizing old entries\n" );
@@ -1144,7 +1144,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
fv->aux = AUX;
fv->srec = srec;
if (svars->drv[t]->set_flags(
svars->ctx[t], srec->msg[t], srec->uid[t], F_DELETED, 0, flags_set_del, fv ))
- return 1;
+ return -1;
} else
debug( " not %sing delete\n",
str_hl[t] );
} else if (!srec->msg[1-t])
@@ -1255,7 +1255,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
fv->aflags = aflags;
fv->dflags = dflags;
if (svars->drv[t]->set_flags( svars->ctx[t],
srec->msg[t], srec->uid[t], aflags, dflags, flags_set_sync, fv ))
- return 1;
+ return -1;
} else
flags_set_sync_p2( svars, srec, t );
}
@@ -1264,7 +1264,7 @@ msgs_found_sel( sync_vars_t *svars, int t )
svars->drv[t]->commit( svars->ctx[t] );
svars->state[t] |= ST_SENT_FLAGS;
if (msgs_flags_set( svars, t ))
- return 1;
+ return -1;
}
return 0;
}
@@ -1287,7 +1287,7 @@ msg_copied( int sts, int uid, copy_vars_t *vars )
cancel_sync( svars );
case SYNC_CANCELED:
free( vars );
- return 1;
+ return -1;
}
free( vars );
svars->new_done[t]++;
@@ -1337,7 +1337,7 @@ msgs_copied( sync_vars_t *svars, int t )
fv->aux = AUX;
fv->srec = srec;
if (svars->drv[t]->find_msg( svars->ctx[t], srec->tuid,
msg_found_new, fv ))
- return 1;
+ return -1;
}
}
svars->state[t] |= ST_SENT_FIND_NEW;
@@ -1351,7 +1351,7 @@ msg_found_new( int sts, int uid, void *aux )
SVARS(vars->aux)
if (check_ret_aux( sts, svars, t, vars ))
- return 1;
+ return -1;
switch (sts) {
case DRV_OK:
debug( " -> new UID %d\n", uid );
@@ -1377,7 +1377,7 @@ flags_set_del( int sts, void *aux )
SVARS(vars->aux)
if (check_ret_aux( sts, svars, t, vars ))
- return 1;
+ return -1;
switch (sts) {
case DRV_OK:
vars->srec->status |= S_DEL(t);
@@ -1398,7 +1398,7 @@ flags_set_sync( int sts, void *aux )
SVARS(vars->aux)
if (check_ret_aux( sts, svars, t, vars ))
- return 1;
+ return -1;
switch (sts) {
case DRV_OK:
if (vars->aflags & F_DELETED)
@@ -1464,7 +1464,7 @@ msgs_flags_set( sync_vars_t *svars, int t )
svars->trash_total[t]++;
stats( svars );
if (svars->drv[t]->trash_msg(
svars->ctx[t], tmsg, msg_trashed, AUX ))
- return 1;
+ return -1;
} else
debug( "%s: not trashing
message %d - not new\n", str_ms[t], tmsg->uid );
} else {
@@ -1479,7 +1479,7 @@ msgs_flags_set( sync_vars_t *svars, int t )
cv->srec = 0;
cv->msg = tmsg;
if (copy_msg( cv ))
- return 1;
+ return -1;
} else
debug( "%s: not remote
trashing message %d - too big\n", str_ms[t], tmsg->uid );
} else
@@ -1499,7 +1499,7 @@ msg_trashed( int sts, void *aux )
if (sts == DRV_MSG_BAD)
sts = DRV_BOX_BAD;
if (check_ret( sts, svars, t ))
- return 1;
+ return -1;
svars->trash_done[t]++;
stats( svars );
return sync_close( svars, t );
@@ -1519,7 +1519,7 @@ msg_rtrashed( int sts, int uid, copy_vars_t *vars )
cancel_sync( svars );
case SYNC_CANCELED:
free( vars );
- return 1;
+ return -1;
}
free( vars );
svars->trash_done[t]++;
@@ -1552,7 +1552,7 @@ box_closed( int sts, void *aux )
SVARS(aux)
if (check_ret( sts, svars, t ))
- return 1;
+ return -1;
svars->state[t] |= ST_DID_EXPUNGE;
box_closed_p2( svars, t );
return 0;
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
isync-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/isync-devel
