Replace strlen(foo) > 0 with *foo.

[nmh] / uip / mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index b2c6f070e4da3336cdb01022c7d625900d9e9efe..02ba0bcc1aad17e31fa42905faba21ff2a7479e1 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -1222,7 +1222,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
         mh_xfree(p->pq_text);
         mh_xfree(p->pq_error);
        q = p->pq_next;
         mh_xfree(p->pq_text);
         mh_xfree(p->pq_error);
        q = p->pq_next;

-       free ((char *) p);
+       free(p);

     }
 
     c2->c_text = add ("\n", c2->c_text);
     }
 
     c2->c_text = add ("\n", c2->c_text);


@@ -1272,7 +1272,7 @@ free_queue (struct mcomp **head, struct mcomp **tail)
         mh_xfree(c1->c_nfs);
        if (c1->c_fmt)
            fmt_free (c1->c_fmt, 0);
         mh_xfree(c1->c_nfs);
        if (c1->c_fmt)
            fmt_free (c1->c_fmt, 0);

-       free ((char *) c1);
+       free(c1);

     }
 
     *head = *tail = NULL;
     }
 
     *head = *tail = NULL;


@@ -1282,14 +1282,15 @@ free_queue (struct mcomp **head, struct mcomp **tail)
 static void
 putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 {
 static void
 putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 {

+    char *text; /* c1's text, or the name as a fallback. */
+    char *trimmed_prefix;

     int count, cchdr;
     char *cp;
     int count, cchdr;
     char *cp;

-    /*
-     * Create a copy of c1->c_text with trailing whitespace
-     * trimmed, for use with blank lines.
-     */
-    char *trimmed_prefix =
-       rtrim (add (c1->c_text ? c1->c_text : c1->c_name, NULL));
+
+    text = c1->c_text ? c1->c_text : c1->c_name;
+    /* Create a copy with trailing whitespace trimmed, for use with
+     * blank lines. */
+    trimmed_prefix = rtrim(add(text, NULL));

 
     cchdr = 0;
     lm = 0;
 
     cchdr = 0;
     lm = 0;


@@ -1318,7 +1319,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
        count = (c1->c_width ? c1->c_width : global.c_width)
            - c1->c_offset - strlen (c2->c_text);
        if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT))
        count = (c1->c_width ? c1->c_width : global.c_width)
            - c1->c_offset - strlen (c2->c_text);
        if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT))

-           count -= strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+           count -= strlen(text) + 2;

        lm = c1->c_offset + (count / 2);
     } else {
        if (c1->c_offset)
        lm = c1->c_offset + (count / 2);
     } else {
        if (c1->c_offset)


@@ -1327,17 +1328,15 @@ 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 */
 
     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++)
-                *cp = toupper ((unsigned char) *cp);
-       putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
+            ToUpper(text);
+       putstr(text, c1->c_flags);

        if (flag != BODYCOMP) {
            putstr (": ", c1->c_flags);
            if (!(c1->c_flags & SPLIT))
                c1->c_flags |= HDROUTPUT;
 
        cchdr++;
        if (flag != BODYCOMP) {
            putstr (": ", c1->c_flags);
            if (!(c1->c_flags & SPLIT))
                c1->c_flags |= HDROUTPUT;
 
        cchdr++;

-       if ((count = c1->c_cwidth -
-               strlen (c1->c_text ? c1->c_text : c1->c_name) - 2) > 0)
+       if ((count = c1->c_cwidth - strlen(text) - 2) > 0)

            while (count--)
                putstr (" ", c1->c_flags);
        }
            while (count--)
                putstr (" ", c1->c_flags);
        }


@@ -1349,8 +1348,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
            && !(c2->c_flags & HDROUTPUT)
            && !(c2->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)
            && !(c2->c_flags & HDROUTPUT)
            && !(c2->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)

-           for (cp = c2->c_name; *cp; cp++)
-                *cp = toupper ((unsigned char) *cp);
+            ToUpper(c2->c_name);

        putstr (c2->c_name, c1->c_flags);
        putstr (": ", c1->c_flags);
        if (!(c1->c_flags & SPLIT))
        putstr (c2->c_name, c1->c_flags);
        putstr (": ", c1->c_flags);
        if (!(c1->c_flags & SPLIT))


@@ -1362,8 +1360,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
                putstr (" ", c1->c_flags);
     }
     if (c1->c_flags & UPPERCASE)
                putstr (" ", c1->c_flags);
     }
     if (c1->c_flags & UPPERCASE)

-       for (cp = c2->c_text; *cp; cp++)
-            *cp = toupper ((unsigned char) *cp);
+        ToUpper(c2->c_text);

 
     count = 0;
     if (cchdr) {
 
     count = 0;
     if (cchdr) {


@@ -1372,7 +1369,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
                        : (int) strlen (c2->c_name) + 2;
        else
            count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth
                        : (int) strlen (c2->c_name) + 2;
        else
            count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth

-                       : strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+                       : strlen(text) + 2;

     }
     count += c1->c_offset;
 
     }
     count += c1->c_offset;
 


@@ -1388,7 +1385,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
            /* Output component, trimming trailing whitespace if there
               is no text on the line. */
            if (*cp) {
            /* Output component, trimming trailing whitespace if there
               is no text on the line. */
            if (*cp) {

-               putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
+               putstr(text, c1->c_flags);

            } else {
                putstr (trimmed_prefix, c1->c_flags);
            }
            } else {
                putstr (trimmed_prefix, c1->c_flags);
            }