From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Sun, 7 May 2017 12:57:39 +0000 (+0100)
Subject: uip/rcvdist.c: Replace SBUFSIZ with NMH_BUFSIZ.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/803e139a6595e33a0a636a3e7fd815ebd942a1dc?hp=b40ecb4417e49cbc53459b28ee394a3b2eb93c9c

uip/rcvdist.c: Replace SBUFSIZ with NMH_BUFSIZ.

The former was defined as the latter and had only one proper use: to
size a char array.  The other uses should have been the sizeof operator
on that array, and now are.
---

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index b013c85d..4c1716a0 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -144,8 +144,6 @@ main (int argc, char **argv)
 
 /* very similar to routine in replsbr.c */
 
-#define	SBUFSIZ	NMH_BUFSIZ
-
 static int outputlinelen = OUTPUTLINELEN;
 
 static struct format *fmt;
@@ -174,7 +172,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 {
     int char_read = 0, format_len, i, state;
     char **ap;
-    char *cp, name[NAMESZ], tmpbuf[SBUFSIZ];
+    char *cp, name[NAMESZ], tmpbuf[NMH_BUFSIZ];
     charstring_t scanl;
     struct comp *cptr;
     FILE *out;
@@ -199,7 +197,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 	cptr->c_text = addrs;
 
     for (;;) {
-	int msg_count = SBUFSIZ;
+	int msg_count = sizeof tmpbuf;
 	switch (state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb)) {
 	    case FLD: 
 	    case FLDPLUS: 
@@ -207,7 +205,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 		if (i != -1) {
 		    char_read += msg_count;
 		    while (state == FLDPLUS) {
-			msg_count = SBUFSIZ;
+			msg_count = sizeof tmpbuf;
 			state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 			fmt_appendcomp(i, name, tmpbuf);
 			char_read += msg_count;
@@ -215,7 +213,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 		}
 
 		while (state == FLDPLUS) {
-		    msg_count = SBUFSIZ;
+		    msg_count = sizeof tmpbuf;
 		    state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 		}
 		break;