commit 6e7bdde9b5fcf3ecdd0a1da672ff64dda0939c39
Author: Oswald Buddenhagen <o...@users.sf.net>
Date: Tue Dec 3 13:06:12 2019 +0100
de-noise initialization of sync records
use calloc() instead of malloc().
src/sync.c | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/src/sync.c b/src/sync.c
index d9f0355..a1ad215 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -811,7 +811,7 @@ load_state( sync_vars_t *svars )
error( "Error: invalid sync state entry at
%s:%d\n", svars->dname, line );
goto jbail;
}
- srec = nfmalloc( sizeof(*srec) );
+ srec = nfcalloc( sizeof(*srec) );
srec->uid[M] = t1;
srec->uid[S] = t2;
s = fbuf;
@@ -836,15 +836,10 @@ load_state( sync_vars_t *svars )
} else if (srec->uid[S] == (uint)-2) {
srec->uid[S] = 0;
srec->status = S_PENDING;
- } else
- srec->status = 0;
- srec->wstate = 0;
+ }
srec->flags = parse_flags( s );
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->msg[M] = srec->msg[S] = NULL;
- srec->tuid[0] = 0;
- srec->next = NULL;
*svars->srecadd = srec;
svars->srecadd = &srec->next;
svars->nsrecs++;
@@ -940,16 +935,11 @@ load_state( sync_vars_t *svars )
svars->uidval[M] = t1;
svars->uidval[S] = t2;
} else if (c == '+') {
- srec = nfmalloc( sizeof(*srec) );
+ srec = nfcalloc( sizeof(*srec) );
srec->uid[M] = t1;
srec->uid[S] = t2;
debug( " new entry(%u,%u)\n", t1, t2 );
- srec->msg[M] = srec->msg[S] = NULL;
srec->status = S_PENDING;
- srec->wstate = 0;
- srec->flags = 0;
- srec->tuid[0] = 0;
- srec->next = NULL;
*svars->srecadd = srec;
svars->srecadd = &srec->next;
svars->nsrecs++;
@@ -1557,7 +1547,6 @@ box_loaded( int sts, message_t *msgs, int total_msgs, int
recent_msgs, void *aux
del[S] = no[S] && srec->uid[S];
for (t = 0; t < 2; t++) {
- srec->aflags[t] = srec->dflags[t] = 0;
if (srec->msg[t] && (srec->msg[t]->flags &
F_DELETED))
srec->wstate |= W_DEL(t);
if (del[t]) {
@@ -1643,19 +1632,13 @@ box_loaded( int sts, message_t *msgs, int total_msgs,
int recent_msgs, void *aux
if (srec) {
debug( " -> pair(%u,%u)
exists\n", srec->uid[M], srec->uid[S] );
} else {
- srec = nfmalloc( sizeof(*srec)
);
- srec->next = NULL;
+ srec = nfcalloc( sizeof(*srec)
);
*svars->srecadd = srec;
svars->srecadd = &srec->next;
svars->nsrecs++;
srec->status = S_PENDING;
- srec->wstate = 0;
- srec->flags = 0;
- srec->tuid[0] = 0;
srec->uid[1-t] = tmsg->uid;
- srec->uid[t] = 0;
srec->msg[1-t] = tmsg;
- srec->msg[t] = NULL;
tmsg->srec = srec;
jFprintf( svars, "+ %u %u\n",
srec->uid[M], srec->uid[S] );
debug( " -> pair(%u,%u)
created\n", srec->uid[M], srec->uid[S] );
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
