From: Ralph Corderoy Date: Mon, 1 May 2017 22:02:06 +0000 (+0100) Subject: mhstoresbr.c: Flip logic to simplify. Remove else after continue. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/10c5b65eb8fefdf84cdb631edcd18160effcdf7e?ds=inline;hp=07731a50fda3a25927b60c48a41be2e5b747ca01 mhstoresbr.c: Flip logic to simplify. Remove else after continue. Former in store_partial(), latter in parse_format_string(). --- diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index d5917211..a651d01a 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -364,20 +364,21 @@ store_partial (CT ct, mhstoreinfo_t info) for (ctq = base; *ctq; ctq++) { p = *ctq; pm = (struct partial *) p->c_ctparams; - if (pm->pm_marked != cur) { - if (pm->pm_marked == cur - 1) { - inform("duplicate part %d of %d part multipart message, continuing...", - pm->pm_marked, hi); - continue; - } + if (pm->pm_marked == cur) { + cur++; + continue; + } + + if (pm->pm_marked == cur - 1) { + inform("duplicate part %d of %d part multipart message, continuing...", + pm->pm_marked, hi); + continue; + } missing_part: - inform("missing %spart %d of %d part multipart message", - cur != hi ? "(at least) " : "", cur, hi); - goto losing; - } - else - cur++; + inform("missing %spart %d of %d part multipart message", + cur != hi ? "(at least) " : "", cur, hi); + goto losing; } if (hi != --cur) { cur = hi; @@ -967,7 +968,8 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir) *bp = '\0'; buflen--; continue; - } else { + } + { PM pm; char *s = "";