X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a23477eb9bd7d1af5f66a171041bf72af932488e..ae8ef7d3f4cfcab63518ea97a5eb2d03f2da9b53:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 6dd1850d..e2d97607 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -521,7 +521,7 @@ mhl (int argc, char **argv)
 	}
 	else
 	    printf ("\n------- End of Forwarded Message%s\n",
-		    vecp > 1 ? "s" : "");
+		    PLURALS(vecp));
     }
 
     fflush(stdout);
@@ -946,7 +946,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 	else {
 	    printf ("\n-------");
 	    if (ofilen == 1)
-		printf (" Forwarded Message%s", ofilec > 1 ? "s" : "");
+		printf (" Forwarded Message%s", PLURALS(ofilec));
 	    else
 		printf (" Message %d", ofilen);
 	    printf ("\n\n");
@@ -1019,13 +1019,13 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		    continue;
 
 		for (c2 = fmthd; c2; c2 = c2->c_next)
-		    if (!strcasecmp (c2->c_name ? c2->c_name : "", name))
+		    if (!strcasecmp (FENDNULL(c2->c_name), name))
 			break;
 		c1 = NULL;
 		if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
 		    for (c1 = msghd; c1; c1 = c1->c_next)
-			if (!strcasecmp (c1->c_name ? c1->c_name : "",
-					 c3->c_name ? c3->c_name : "")) {
+			if (!strcasecmp (FENDNULL(c1->c_name),
+					 FENDNULL(c3->c_name))) {
 			    c1->c_text =
 				mcomp_add (c1->c_flags, buf, c1->c_text);
 			    break;
@@ -1085,8 +1085,8 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 			continue;
 		    }
 		    for (c2 = msghd; c2; c2 = c2->c_next)
-			if (!strcasecmp (c2->c_name ? c2->c_name : "",
-					 c1->c_name ? c1->c_name : "")) {
+			if (!strcasecmp (FENDNULL(c2->c_name),
+					 FENDNULL(c1->c_name))) {
 			    putcomp (c1, c2, ONECOMP);
 			    if (!(c1->c_flags & SPLIT))
 				break;
@@ -1590,7 +1590,7 @@ putch (char ch, unsigned long flags)
 	putch ('\n', flags);
 	if (ovoff > 0)
 	    lm = ovoff;
-	putstr (ovtxt ? ovtxt : "", flags);
+	putstr (FENDNULL(ovtxt), flags);
 	putch (ch, flags);
 	return;
     }