From: Ralph Corderoy Date: Tue, 12 Sep 2017 14:34:31 +0000 (+0100) Subject: Replace `return (0)' and similar with `return 0'. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/5c01446c027960e00b33f623212de645475569aa?hp=459c5e3d66287e314dff8543df32c6c14a8464c6 Replace `return (0)' and similar with `return 0'. Just outer parenthesis removed. --- diff --git a/config/config.c b/config/config.c index 5b08db28..fa3df3bd 100644 --- a/config/config.c +++ b/config/config.c @@ -77,7 +77,7 @@ try_it: /* Check nmh `etc' directory */ snprintf (epath, sizeof(epath), nmhetcdir(/%s), file); - return (access (epath, R_OK) != NOTOK ? epath : file); + return access(epath, R_OK) != NOTOK ? epath : file; } diff --git a/sbr/context_find.c b/sbr/context_find.c index c6ae2d8c..f4fe7ed1 100644 --- a/sbr/context_find.c +++ b/sbr/context_find.c @@ -16,7 +16,7 @@ context_find (const char *str) str = FENDNULL(str); for (np = m_defs; np; np = np->n_next) if (!strcasecmp(FENDNULL(np->n_name), str)) - return (np->n_field); + return np->n_field; return NULL; } diff --git a/sbr/dtime.c b/sbr/dtime.c index 56d874e0..dd6802b2 100644 --- a/sbr/dtime.c +++ b/sbr/dtime.c @@ -118,7 +118,7 @@ dlocaltime (time_t *clock) tw.tw_clock = *clock; - return (&tw); + return &tw; } @@ -165,7 +165,7 @@ dgmtime (time_t *clock) tw.tw_clock = *clock; - return (&tw); + return &tw; } diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c index befbd94b..3cde1fd9 100644 --- a/sbr/ext_hook.c +++ b/sbr/ext_hook.c @@ -23,7 +23,7 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2) static int did_message = 0; /* set if we've already output a message */ if ((hook = context_find(hook_name)) == NULL) - return (OK); + return OK; switch (pid = fork()) { case -1: @@ -59,7 +59,7 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2) did_message = 1; } - return (NOTOK); + return NOTOK; } else - return (OK); + return OK; } diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c index 8e2e5456..2c7b58e4 100644 --- a/sbr/fmt_addr.c +++ b/sbr/fmt_addr.c @@ -108,7 +108,7 @@ formataddr (char *orig, char *str) *dst = '\0'; last_dst = dst; - return (buf); + return buf; } char *concataddr (char *orig, char *str) diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index aa555c62..d25c3bbb 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -419,7 +419,7 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable) *fmt = formatvec; free(format_string); - return (ncomp); + return ncomp; } static char * @@ -444,7 +444,7 @@ compile (char *sp) break; } if (c == 0) - return (cp); + return cp; switch (c = *++cp) { case '%': @@ -456,7 +456,7 @@ compile (char *sp) case '>': case '?': case ']': - return (cp); + return cp; case '<': cp = do_if(++cp); @@ -531,7 +531,7 @@ do_spec(char *sp) fp->f_width = wid; fp->f_fill = fill; - return (cp); + return cp; } /* @@ -595,7 +595,7 @@ do_name(char *sp, int preprocess) cm->c_type |= CT_ADDR; break; } - return (cp); + return cp; } /* @@ -759,7 +759,7 @@ do_func(char *sp) CERROR("')' expected"); } --infunction; - return (cp); + return cp; } /* @@ -778,13 +778,13 @@ do_expr (char *sp, int preprocess) } else if (c == '(') { cp = do_func (cp); } else if (c == ')') { - return (--cp); + return --cp; } else if (c == '%' && *cp == '<') { cp = do_if (cp+1); } else { CERROR ("'(', '{', '%<' or ')' expected"); } - return (cp); + return cp; } /* @@ -921,7 +921,7 @@ do_if(char *sp) if (fexpr) /* IF ... [ELSIF ...] ENDIF */ fexpr->f_skip = next_fp - fexpr; - return (cp); + return cp; } /* diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c index a43b5dc1..db8bf785 100644 --- a/sbr/fmt_rfc2047.c +++ b/sbr/fmt_rfc2047.c @@ -52,7 +52,7 @@ decode_qp (unsigned char byte1, unsigned char byte2) { if (hexindex[byte1] == -1 || hexindex[byte2] == -1) return -1; - return (hexindex[byte1] << 4 | hexindex[byte2]); + return hexindex[byte1] << 4 | hexindex[byte2]; } /* Check if character is linear whitespace */ diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index e80edc19..791146a2 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -1206,5 +1206,5 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, } } - return (NULL); + return NULL; } diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c index 1e43571e..5c47aa11 100644 --- a/sbr/ruserpass.c +++ b/sbr/ruserpass.c @@ -218,7 +218,7 @@ token(char *tokval) for (t = toktabs; t->tokstr; t++) if (!strcmp(t->tokstr, tokval)) - return (t->tval); + return t->tval; - return (ID); + return ID; } diff --git a/sbr/seq_list.c b/sbr/seq_list.c index c4564281..f3a26738 100644 --- a/sbr/seq_list.c +++ b/sbr/seq_list.c @@ -38,9 +38,9 @@ seq_list(struct msgs *mp, char *seqname) if (!strcmp (current, seqname)) { if (mp->curmsg) { snprintf(buffer, len, "%s", m_name(mp->curmsg)); - return (buffer); + return buffer; } - return (NULL); + return NULL; } /* If the folder is empty, just return NULL */ diff --git a/sbr/signals.c b/sbr/signals.c index accb6950..ad18261b 100644 --- a/sbr/signals.c +++ b/sbr/signals.c @@ -39,8 +39,8 @@ SIGNAL (int sig, SIGNAL_HANDLER func) # endif } if (sigaction(sig, &act, &oact) < 0) - return (SIG_ERR); - return (oact.sa_handler); + return SIG_ERR; + return oact.sa_handler; } @@ -56,7 +56,7 @@ SIGNAL2 (int sig, SIGNAL_HANDLER func) struct sigaction act, oact; if (sigaction(sig, NULL, &oact) < 0) - return (SIG_ERR); + return SIG_ERR; if (oact.sa_handler != SIG_IGN) { act.sa_handler = func; sigemptyset(&act.sa_mask); @@ -72,9 +72,9 @@ SIGNAL2 (int sig, SIGNAL_HANDLER func) # endif } if (sigaction(sig, &act, &oact) < 0) - return (SIG_ERR); + return SIG_ERR; } - return (oact.sa_handler); + return oact.sa_handler; } diff --git a/sbr/smatch.c b/sbr/smatch.c index f30e5899..802e4da0 100644 --- a/sbr/smatch.c +++ b/sbr/smatch.c @@ -41,5 +41,5 @@ smatch(const char *string, const struct swit *swp) firstone = AMBIGSW; } - return (firstone); + return firstone; } diff --git a/sbr/strindex.c b/sbr/strindex.c index ad1d18fe..b2bc9ff9 100644 --- a/sbr/strindex.c +++ b/sbr/strindex.c @@ -17,7 +17,7 @@ stringdex (char *p1, char *p2) for (p = p2; *p; p++) if (uprf (p, p1)) - return (p - p2); + return p - p2; return -1; } diff --git a/uip/aliasbr.c b/uip/aliasbr.c index e5163a01..7e8cf29a 100644 --- a/uip/aliasbr.c +++ b/uip/aliasbr.c @@ -154,7 +154,7 @@ aleq (char *string, char *aliasent) aliasent++; } - return (*aliasent == 0 || *aliasent == '*'); + return *aliasent == 0 || *aliasent == '*'; } diff --git a/uip/burst.c b/uip/burst.c index 87538ae7..5623e2c1 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -252,7 +252,7 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw) adios (msgnam, "does not have any message/rfc822 parts"); if (msgp > 1) { *mimesw = 1; - return (msgp - 1); + return msgp - 1; } } } @@ -315,7 +315,7 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw) } fclose (in); - return (msgp - 1); /* return the number of messages burst */ + return msgp - 1; /* return the number of messages burst */ } diff --git a/uip/fmttest.c b/uip/fmttest.c index 78f08561..16d303f9 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -1269,7 +1269,7 @@ test_formataddr (char *orig, char *str) *dst = '\0'; last_dst = dst; - return (buf); + return buf; } diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index df0e24bf..9b7cdd49 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -1111,7 +1111,7 @@ mcomp_flags (char *name) for (ap = pairs; ap->p_name; ap++) if (!strcasecmp (ap->p_name, name)) - return (ap->p_flags); + return ap->p_flags; return 0; } diff --git a/uip/mhparam.c b/uip/mhparam.c index 3fc381b8..bfecb9fb 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -270,7 +270,7 @@ p_find(char *str) for (ps = procs; ps->p_name; ps++) if (!strcasecmp (ps->p_name, str)) - return (*ps->p_field); + return *ps->p_field; return NULL; } diff --git a/uip/mhparse.c b/uip/mhparse.c index 1dc44e7a..1b2d23f7 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -1714,11 +1714,11 @@ size_encoding (CT ct) } if (ct->c_encoding == CE_EXTERNAL) - return (ct->c_end - ct->c_begin); + return ct->c_end - ct->c_begin; file = NULL; if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK) - return (ct->c_end - ct->c_begin); + return ct->c_end - ct->c_begin; if (fstat (fd, &st) != NOTOK) size = (long) st.st_size; diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 0e9b94cd..2a094f2b 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -470,7 +470,7 @@ ct_compar (CT *a, CT *b) struct partial *am = (struct partial *) ((*a)->c_ctparams); struct partial *bm = (struct partial *) ((*b)->c_ctparams); - return (am->pm_marked - bm->pm_marked); + return am->pm_marked - bm->pm_marked; } diff --git a/uip/picksbr.c b/uip/picksbr.c index 54b50e70..432bcf10 100644 --- a/uip/picksbr.c +++ b/uip/picksbr.c @@ -793,7 +793,7 @@ advance (char *alp, char *aep) do { lp--; if (advance ((char *) lp, (char *) ep)) - return (1); + return 1; } while (lp > curlp); return 0; @@ -812,14 +812,14 @@ cclass (unsigned char *aset, int ac, int af) set = aset; if ((c = ac) == 0) - return (0); + return 0; n = *set++; while (n--) if (*set++ == c || set[-1] == cc[c]) - return (af); + return af; - return (!af); + return !af; } diff --git a/uip/post.c b/uip/post.c index 7cbf9dc9..81197fc7 100644 --- a/uip/post.c +++ b/uip/post.c @@ -1224,7 +1224,7 @@ get_header (char *header, struct headers *table) header = FENDNULL(header); for (h = table; h->value; h++) if (!strcasecmp(FENDNULL(h->value), header)) - return (h - table); + return h - table; return NOTOK; } @@ -1300,7 +1300,7 @@ putadr (char *name, char *aka, struct mailname *mp, FILE *out, linepos += len; - return (flags & HTRY); + return flags & HTRY; } diff --git a/uip/replsbr.c b/uip/replsbr.c index b5e10827..afcf2ffc 100644 --- a/uip/replsbr.c +++ b/uip/replsbr.c @@ -345,7 +345,7 @@ replformataddr (char *orig, char *str) *dst = '\0'; last_dst = dst; - return (buf); + return buf; } diff --git a/uip/sortm.c b/uip/sortm.c index 2e2809a2..3b5a4d8a 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -343,7 +343,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) { admonish (msgnam, "unable to read message"); - return (0); + return 0; } gstate = m_getfld_state_init(in); for (compnum = 1;;) { @@ -393,7 +393,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) free(datecomp); free(subjcomp); fclose (in); - return (0); + return 0; default: adios (NULL, "internal error -- you lose"); @@ -455,7 +455,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) fclose (in); free(datecomp); - return (1); + return 1; } /* @@ -465,12 +465,12 @@ static int dsort (struct smsg **a, struct smsg **b) { if ((*a)->s_clock < (*b)->s_clock) - return (-1); + return -1; if ((*a)->s_clock > (*b)->s_clock) - return (1); + return 1; if ((*a)->s_msg < (*b)->s_msg) - return (-1); - return (1); + return -1; + return 1; } /* @@ -482,7 +482,7 @@ subsort (struct smsg **a, struct smsg **b) int i; if ((i = strcmp ((*a)->s_subj, (*b)->s_subj))) - return (i); + return i; return (dsort (a, b)); } @@ -493,10 +493,10 @@ txtsort (struct smsg **a, struct smsg **b) int i; if ((i = strcmp ((*a)->s_subj, (*b)->s_subj))) - return (i); + return i; if ((*a)->s_msg < (*b)->s_msg) - return (-1); - return (1); + return -1; + return 1; } static void diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 72b315f4..b02b5e22 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -882,7 +882,7 @@ buildfile (char **argp, char *file) i = editfile (&ed, args, file, NOUSE, NULL, NULL, NULL, 0, 0); free (args); - return (i ? NOTOK : OK); + return i ? NOTOK : OK; } @@ -1283,7 +1283,7 @@ whomfile (char **arg, char *file) _exit (-1); /* NOTREACHED */ default: - return (pidwait (pid, NOTOK) & 0377 ? 1 : 0); + return pidwait(pid, NOTOK) & 0377 ? 1 : 0; } } @@ -1316,7 +1316,7 @@ checkmimeheader (char *drft) if ((f = fopen(drft, "r")) == NULL) { admonish(drft, "unable to read draft"); - return (0); + return 0; } gstate = m_getfld_state_init(f);