X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/91fff561d7a49b85c148c2de4cd82610b32a9cec..0db4e9eaa147062611dd63e80e2a2df567d398ba:/uip/mhlsbr.c?ds=inline

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index e948da94..32bf93f2 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -545,7 +545,7 @@ static void
 mhl_format (char *file, int length, int width)
 {
     int i;
-    char *bp, *cp, **ip;
+    char *bp, **ip;
     char *ap, name[NAMESZ];
     struct mcomp *c1;
     struct stat st;
@@ -560,8 +560,7 @@ mhl_format (char *file, int length, int width)
 		&& dev == st.st_dev
 		&& ino == st.st_ino)
 	    goto out;
-	else
-	    free_queue (&fmthd, &fmttl);
+        free_queue (&fmthd, &fmttl);
     }
 
     if ((fp = fopen (etcpath (file), "r")) == NULL)
@@ -591,8 +590,7 @@ mhl_format (char *file, int length, int width)
 	if (*bp == ';')
 	    continue;
 
-	if ((cp = strchr(bp, '\n')))
-	    *cp = 0;
+        TrimSuffixC(bp, '\n');
 
 	if (*bp == ':') {
 	    (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
@@ -990,7 +988,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 			nmh_clear_screen ();
 		}
 		else
-		    printf ("\n");
+		    putchar('\n');
 		break;
 
 	    default: 
@@ -1338,8 +1336,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)		/* uppercase component also */
 	    for (cp = (c1->c_text ? c1->c_text : c1->c_name); *cp; cp++)
-	        if (islower ((unsigned char) *cp))
-		    *cp = toupper ((unsigned char) *cp);
+                *cp = toupper ((unsigned char) *cp);
 	putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
 	if (flag != BODYCOMP) {
 	    putstr (": ", c1->c_flags);
@@ -1361,8 +1358,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    && !(c2->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)
 	    for (cp = c2->c_name; *cp; cp++)
-	        if (islower ((unsigned char) *cp))
-		    *cp = toupper ((unsigned char) *cp);
+                *cp = toupper ((unsigned char) *cp);
 	putstr (c2->c_name, c1->c_flags);
 	putstr (": ", c1->c_flags);
 	if (!(c1->c_flags & SPLIT))
@@ -1375,8 +1371,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     }
     if (c1->c_flags & UPPERCASE)
 	for (cp = c2->c_text; *cp; cp++)
-	    if (islower ((unsigned char) *cp))
-		*cp = toupper ((unsigned char) *cp);
+            *cp = toupper ((unsigned char) *cp);
 
     count = 0;
     if (cchdr) {