X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/46e724549778afa8dc1704d9c601166de6c532eb..47313b9bc395470311e383b57eb184c830662c4a:/uip/mhparse.c diff --git a/uip/mhparse.c b/uip/mhparse.c index cb7d5652..5dae9fd7 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -1201,10 +1201,9 @@ end_part: if (inout) goto next_part; goto last_part; - } else { - if (strcmp (bufp + 2, m->mp_stop) == 0) - goto end_part; } + if (strcmp (bufp + 2, m->mp_stop) == 0) + goto end_part; } } @@ -1702,8 +1701,7 @@ size_encoding (CT ct) if (ce->ce_file) { if (stat (ce->ce_file, &st) != NOTOK) return (long) st.st_size; - else - return 0L; + return 0L; } if (ct->c_encoding == CE_EXTERNAL) @@ -2325,9 +2323,8 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd) ce->ce_file = mh_xstrdup(cachefile); ce->ce_unlink = 0; goto ready_already; - } else { - admonish (cachefile, "unable to fopen for reading"); } + admonish (cachefile, "unable to fopen for reading"); } *fd = fileno (ce->ce_fp); @@ -2515,7 +2512,7 @@ openFTP (CT ct, char **file) LocalName (1)); pass = buffer; } else { - ruserpass (e->eb_site, &username, &password); + ruserpass (e->eb_site, &username, &password, 0); user = username; pass = password; } @@ -2919,17 +2916,16 @@ readDigest (CT ct, char *cp) } return OK; - } else { - if (debugsw) { - fprintf (stderr, "invalid MD5 digest (got %d octets)\n", - (int) strlen ((char *) digest)); - } - - return NOTOK; } - } else { + if (debugsw) { + fprintf (stderr, "invalid MD5 digest (got %d octets)\n", + (int) strlen ((char *) digest)); + } + return NOTOK; } + + return NOTOK; } @@ -4136,8 +4132,7 @@ get_param(PM first, const char *name, char replace, int fetchonly) if (strcasecmp(name, first->pm_name) == 0) { if (fetchonly) return first->pm_value; - else - return getcpy(get_param_value(first, replace)); + return getcpy(get_param_value(first, replace)); } first = first->pm_next; }