From 47e4d2685ab31e71336a7806fdc3dcd2a107f60f Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Fri, 12 May 2017 22:42:35 +0100 Subject: [PATCH] Use existing macros min() and max() more. --- h/mh.h | 2 +- sbr/arglist.c | 4 ++-- sbr/charstring.c | 4 ++-- sbr/escape_addresses.c | 4 ++-- sbr/fmt_compile.c | 2 +- sbr/icalparse.y | 2 +- sbr/m_convert.c | 4 ++-- sbr/m_getfld.c | 2 +- sbr/mime_type.c | 2 +- sbr/netsec.c | 2 +- uip/mhical.c | 4 ++-- uip/popsbr.c | 2 +- uip/scansbr.c | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/h/mh.h b/h/mh.h index a72971df..e549b2d4 100644 --- a/h/mh.h +++ b/h/mh.h @@ -20,7 +20,7 @@ * This macro is for use by scan, for example, so that platforms with * a small BUFSIZ can easily allocate larger buffers. */ -#define NMH_BUFSIZ (BUFSIZ>=8192 ? BUFSIZ : 8192) +#define NMH_BUFSIZ max(BUFSIZ, 8192) #ifndef FALSE #define FALSE false diff --git a/sbr/arglist.c b/sbr/arglist.c index 328d9e9c..cd88b86b 100644 --- a/sbr/arglist.c +++ b/sbr/arglist.c @@ -199,8 +199,8 @@ argsplit_insert(struct msgs_array *msgs, char *command, char **program) */ if (msgs->size + argp >= msgs->max) { - msgs->max += MAXMSGS > argp ? MAXMSGS : argp; - msgs->msgs = mh_xrealloc(msgs->msgs, msgs->max * sizeof(*msgs->msgs)); + msgs->max += max(MAXMSGS, argp); + msgs->msgs = mh_xrealloc(msgs->msgs, msgs->max * sizeof(*msgs->msgs)); } for (i = msgs->size - 1; i >= 0; i--) diff --git a/sbr/charstring.c b/sbr/charstring.c index b9b94bd9..589b000e 100644 --- a/sbr/charstring.c +++ b/sbr/charstring.c @@ -180,8 +180,8 @@ charstring_last_char_len (const charstring_t s) { len = mbtowc (&wide_char, sp, (size_t) MB_CUR_MAX < remaining ? (size_t) MB_CUR_MAX : remaining); - sp += len > 0 ? len : 1; - remaining -= len > 0 ? len : 1; + sp += max(len, 1); + remaining -= max(len, 1); } #else /* ! MULTIBYTE_SUPPORT */ if (charstring_bytes (s) > 0) { len = 1; } diff --git a/sbr/escape_addresses.c b/sbr/escape_addresses.c index a484a11e..11a4faa3 100644 --- a/sbr/escape_addresses.c +++ b/sbr/escape_addresses.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include #include static void @@ -76,7 +76,7 @@ escape_component (char *name, size_t namesize, char *chars_to_escape) { if (strcmp (tmp, "\"")) { size_t len = destp - tmp; assert ((ssize_t) strlen(tmp) + 1 == destp - tmp); - strncpy (name, tmp, len <= namesize ? len : namesize); + strncpy (name, tmp, min(len, namesize)); } else { /* Handle just " as special case here instead of above. */ strncpy (name, "\"\\\"\"", namesize); diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index f4c8d5dc..33f34efe 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -365,7 +365,7 @@ compile_error(char *str, char *cp) int i, errpos, errctx; errpos = cp - format_string; - errctx = errpos > 20 ? 20 : errpos; + errctx = min(errpos, 20); usr_fstring[errpos] = '\0'; for (i = errpos-errctx; i < errpos; i++) { diff --git a/sbr/icalparse.y b/sbr/icalparse.y index 7730726f..ac0bc50a 100644 --- a/sbr/icalparse.y +++ b/sbr/icalparse.y @@ -196,7 +196,7 @@ append (contentline *cline, const char *src, const size_t src_len) { while (len >= cline->input_line_size) { cline->input_line_size = cline->input_line_size == 0 - ? (BUFSIZ>=8192 ? BUFSIZ : 8192) + ? max(BUFSIZ, 8192) : 2 * cline->input_line_size; cline->input_line = mh_xrealloc (cline->input_line, cline->input_line_size); diff --git a/sbr/m_convert.c b/sbr/m_convert.c index e4062680..566b02a5 100644 --- a/sbr/m_convert.c +++ b/sbr/m_convert.c @@ -202,8 +202,8 @@ single: * limits simply reallocate the folder so it's within range. */ if (first < mp->lowoff || first > mp->hghoff) - mp = folder_realloc(mp, first < mp->lowoff ? first : mp->lowoff, - first > mp->hghoff ? first : mp->hghoff); + mp = folder_realloc(mp, min(first, mp->lowoff), + max(first, mp->hghoff)); set_select_empty (mp, first); } else { diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 8d784889..0f068031 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -664,7 +664,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz, max = *bufsz-1; /* Back up and store the current position. */ bp = --s->readpos; - c = s->end - s->readpos < max ? s->end - s->readpos : max; + c = min(s->end - s->readpos, max); if (s->msg_style != MS_DEFAULT && c > 1) { /* * packed maildrop - only take up to the (possible) diff --git a/sbr/mime_type.c b/sbr/mime_type.c index 395c10cc..bcc1c392 100644 --- a/sbr/mime_type.c +++ b/sbr/mime_type.c @@ -131,7 +131,7 @@ get_file_info(const char *proc, const char *file_name) { FILE *fp; if ((fp = popen(cmd, "r")) != NULL) { - char buf[BUFSIZ >= 2048 ? BUFSIZ : 2048]; + char buf[max(BUFSIZ, 2048)]; buf[0] = '\0'; if (fgets(buf, sizeof buf, fp)) { diff --git a/sbr/netsec.c b/sbr/netsec.c index 8a03cada..a64743aa 100644 --- a/sbr/netsec.c +++ b/sbr/netsec.c @@ -391,7 +391,7 @@ netsec_read(netsec_context *nsc, void *buffer, size_t size, char **errstr) * assume here that this has something in it. */ - retlen = size > nsc->ns_inbuflen ? nsc->ns_inbuflen : size; + retlen = min(size, nsc->ns_inbuflen); memcpy(buffer, nsc->ns_inptr, retlen); diff --git a/uip/mhical.c b/uip/mhical.c index 594a452b..67ba90da 100644 --- a/uip/mhical.c +++ b/uip/mhical.c @@ -809,7 +809,7 @@ fold (char *line, int uses_cr) { #endif charstring_push_back_chars (folded_line, cp, char_len, 1); - remaining -= char_len > 0 ? char_len : 1; + remaining -= max(char_len, 1); /* remaining must be > 0 to pass the loop condition above, so if it's not > 1, it is == 1. */ @@ -824,7 +824,7 @@ fold (char *line, int uses_cr) { } } - cp += char_len > 0 ? char_len : 1; + cp += max(char_len, 1); } free (line); diff --git a/uip/popsbr.c b/uip/popsbr.c index a0229576..0d655b84 100644 --- a/uip/popsbr.c +++ b/uip/popsbr.c @@ -734,7 +734,7 @@ pop_getline (char *s, int n, netsec_context *ns) * someday. */ - destlen = len < ((size_t) (n - 1)) ? len : (size_t) (n - 1); + destlen = min(len, (size_t)(n - 1)); memcpy(s, p, destlen); s[destlen] = '\0'; diff --git a/uip/scansbr.c b/uip/scansbr.c index 715357bc..7023502f 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -59,7 +59,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, width = INT_MAX; } dat[3] = slwidth = width; - *scanl = charstring_create (width < NMH_BUFSIZ ? width : NMH_BUFSIZ); + *scanl = charstring_create (min(width, NMH_BUFSIZ)); if (outnum) umask(~m_gmprot()); -- 2.56.0