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

de-noise initialization of sync records

Browse Source 
use calloc() instead of malloc().
This commit is contained in:
Oswald Buddenhagen 2019-12-03 13:06:12 +01:00
parent e7bc402d09
commit 841f07efd0
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/sync.c
View File

@ -781,7 +781,7 @@ load_state( sync_vars_t *svars )
error( "Error: invalid sync state entry at %s:%d\n", svars->dname, line ); error( "Error: invalid sync state entry at %s:%d\n", svars->dname, line );
goto jbail; goto jbail;
} }
srec = nfmalloc( sizeof(*srec) ); srec = nfcalloc( sizeof(*srec) );
srec->uid[M] = t1; srec->uid[M] = t1;
srec->uid[S] = t2; srec->uid[S] = t2;
s = fbuf; s = fbuf;
@ -806,15 +806,10 @@ load_state( sync_vars_t *svars )
} else if (srec->uid[S] == (uint)-2) { } else if (srec->uid[S] == (uint)-2) {
srec->uid[S] = 0; srec->uid[S] = 0;
srec->status = S_PENDING; srec->status = S_PENDING;
} else }
srec->status = 0;
srec->wstate = 0;
srec->flags = parse_flags( s ); srec->flags = parse_flags( s );
debug( " entry (%u,%u,%u,%s)\n", srec->uid[M], srec->uid[S], srec->flags, debug( " entry (%u,%u,%u,%s)\n", srec->uid[M], srec->uid[S], srec->flags,
(srec->status & S_SKIPPED) ? "SKIP" : (srec->status & S_PENDING) ? "FAIL" : (srec->status & S_EXPIRED) ? "XPIRE" : "" ); (srec->status & S_SKIPPED) ? "SKIP" : (srec->status & S_PENDING) ? "FAIL" : (srec->status & S_EXPIRED) ? "XPIRE" : "" );
srec->msg[M] = srec->msg[S] = 0;
srec->tuid[0] = 0;
srec->next = 0;
*svars->srecadd = srec; *svars->srecadd = srec;
svars->srecadd = &srec->next; svars->srecadd = &srec->next;
svars->nsrecs++; svars->nsrecs++;
@ -908,7 +903,7 @@ load_state( sync_vars_t *svars )
svars->uidval[M] = t1; svars->uidval[M] = t1;
svars->uidval[S] = t2; svars->uidval[S] = t2;
} else if (c == '+') { } else if (c == '+') {
srec = nfmalloc( sizeof(*srec) ); srec = nfcalloc( sizeof(*srec) );
srec->uid[M] = t1; srec->uid[M] = t1;
srec->uid[S] = t2; srec->uid[S] = t2;
if (svars->newmaxuid[M] < t1) if (svars->newmaxuid[M] < t1)
@ -916,12 +911,7 @@ load_state( sync_vars_t *svars )
if (svars->newmaxuid[S] < t2) if (svars->newmaxuid[S] < t2)
svars->newmaxuid[S] = t2; svars->newmaxuid[S] = t2;
debug( " new entry(%u,%u)\n", t1, t2 ); debug( " new entry(%u,%u)\n", t1, t2 );
srec->msg[M] = srec->msg[S] = 0;
srec->status = S_PENDING; srec->status = S_PENDING;
srec->wstate = 0;
srec->flags = 0;
srec->tuid[0] = 0;
srec->next = 0;
*svars->srecadd = srec; *svars->srecadd = srec;
svars->srecadd = &srec->next; svars->srecadd = &srec->next;
svars->nsrecs++; svars->nsrecs++;
@ -1534,7 +1524,6 @@ box_loaded( int sts, message_t *msgs, int total_msgs, int recent_msgs, void *aux
del[S] = no[S] && srec->uid[S]; del[S] = no[S] && srec->uid[S];
for (t = 0; t < 2; t++) { for (t = 0; t < 2; t++) {
srec->aflags[t] = srec->dflags[t] = 0;
if (srec->msg[t] && (srec->msg[t]->flags & F_DELETED)) if (srec->msg[t] && (srec->msg[t]->flags & F_DELETED))
srec->wstate |= W_DEL(t); srec->wstate |= W_DEL(t);
if (del[t]) { if (del[t]) {
@ -1618,19 +1607,13 @@ box_loaded( int sts, message_t *msgs, int total_msgs, int recent_msgs, void *aux
if (srec) { if (srec) {
debug( " -> pair(%u,%u) exists\n", srec->uid[M], srec->uid[S] ); debug( " -> pair(%u,%u) exists\n", srec->uid[M], srec->uid[S] );
} else { } else {
srec = nfmalloc( sizeof(*srec) ); srec = nfcalloc( sizeof(*srec) );
srec->next = 0;
*svars->srecadd = srec; *svars->srecadd = srec;
svars->srecadd = &srec->next; svars->srecadd = &srec->next;
svars->nsrecs++; svars->nsrecs++;
srec->status = S_PENDING; srec->status = S_PENDING;
srec->wstate = 0;
srec->flags = 0;
srec->tuid[0] = 0;
srec->uid[1-t] = tmsg->uid; srec->uid[1-t] = tmsg->uid;
srec->uid[t] = 0;
srec->msg[1-t] = tmsg; srec->msg[1-t] = tmsg;
srec->msg[t] = 0;
tmsg->srec = srec; tmsg->srec = srec;
if (svars->newmaxuid[1-t] < tmsg->uid) if (svars->newmaxuid[1-t] < tmsg->uid)
svars->newmaxuid[1-t] = tmsg->uid; svars->newmaxuid[1-t] = tmsg->uid;