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

fix signedness of 'nex' variables

Browse Source 
they are derived from srec->status, which is unsigned. for not
understood reasons, the compiler complains only after extending status
to a full unsigned int.

on the way, localize the declarations.
This commit is contained in:
Oswald Buddenhagen 2017-03-29 15:14:56 +02:00
parent 1e939bafd8
commit 1fdf793a3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sync.c
View File

@ -1374,7 +1374,7 @@ box_loaded( int sts, void *aux )
message_t *tmsg; message_t *tmsg;
flag_vars_t *fv; flag_vars_t *fv;
int uid, no[2], del[2], alive, todel, t1, t2; int uid, no[2], del[2], alive, todel, t1, t2;
int sflags, nflags, aflags, dflags, nex; int sflags, nflags, aflags, dflags;
uint hashsz, idx; uint hashsz, idx;
char fbuf[16]; /* enlarge when support for keywords is added */ char fbuf[16]; /* enlarge when support for keywords is added */
@ -1709,7 +1709,7 @@ box_loaded( int sts, void *aux )
if (!srec->tuid[0]) { if (!srec->tuid[0]) {
if (!srec->msg[S]) if (!srec->msg[S])
continue; continue;
nex = (srec->status / S_NEXPIRE) & 1; uint nex = (srec->status / S_NEXPIRE) & 1;
if (nex != ((srec->status / S_EXPIRED) & 1)) { if (nex != ((srec->status / S_EXPIRED) & 1)) {
/* The record needs a state change ... */ /* The record needs a state change ... */
if (nex != ((srec->status / S_EXPIRE) & 1)) { if (nex != ((srec->status / S_EXPIRE) & 1)) {
@ -1986,7 +1986,7 @@ flags_set_p2( sync_vars_t *svars, sync_rec_t *srec, int t )
Fprintf( svars->jfp, "* %d %d %u\n", srec->uid[M], srec->uid[S], nflags ); Fprintf( svars->jfp, "* %d %d %u\n", srec->uid[M], srec->uid[S], nflags );
} }
if (t == S) { if (t == S) {
int nex = (srec->status / S_NEXPIRE) & 1; uint nex = (srec->status / S_NEXPIRE) & 1;
if (nex != ((srec->status / S_EXPIRED) & 1)) { if (nex != ((srec->status / S_EXPIRED) & 1)) {
if (nex && (svars->smaxxuid < srec->uid[S])) if (nex && (svars->smaxxuid < srec->uid[S]))
svars->smaxxuid = srec->uid[S]; svars->smaxxuid = srec->uid[S];