X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9514ca81bd12a47df977822efc14ff285bd5bc10..665dfc96f45c47ecfae79f1baa2c29dabe5a2ded:/sbr/m_getfld.c?ds=sidebyside

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index fe8e927b..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)
@@ -793,9 +793,8 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
 	if ((c = Getc (s)) == EOF) {
 	    *cp = '\0';
 	    break;
-	} else {
-	    *cp = c;
 	}
+        *cp = c;
     }
 
     if (i == sizeof from-1  &&  strncmp (text, "From ", sizeof from-1) == 0) {
@@ -876,9 +875,8 @@ m_Eom (m_getfld_state_t s)
 	if ((c2 = Getc (s)) == EOF) {
 	    *cp = '\0';
 	    break;
-	} else {
-	    *cp = c2;
 	}
+        *cp = c2;
     }
 
     if (i != s->edelimlen  ||