Silence more gcc format-string warnings.

[nmh] / uip / ali.c

diff --git a/uip/ali.c b/uip/ali.c
index 4d73afa7b38c3e6c47915d4f4a10a7d7a3834944..a75edf3644b97deef7e80128f1046e0830f7f0b1 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -1,6 +1,4 @@
-
-/*
- * ali.c -- list nmh mail aliases
+/* ali.c -- list nmh mail aliases
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -143,9 +141,13 @@ main (int argc, char **argv)
        } else {
            /* print them all */
            for (ak = akahead; ak; ak = ak->ak_next) {
+                char *res;
+
                printf ("%s: ", ak->ak_name);
                pos += strlen (ak->ak_name) + 1;
-               print_aka (akresult (ak), list, pos);
+                res = akresult(ak);
+               print_aka(res, list, pos);
+                free(res);
            }
        }
     }
@@ -215,10 +217,10 @@ print_usr (char *s, int list)
        while ((cp = getname (pp))) {
            if ((np = getm (cp, NULL, 0, NULL, 0)) == NULL)
                continue;
-           if (!strcasecmp (mp->m_host ? mp->m_host : "",
-                            np->m_host ? np->m_host : "")  &&
-               !strcasecmp (mp->m_mbox ? mp->m_mbox : "",
-                            np->m_mbox ? np->m_mbox : "")) {
+           if (!strcasecmp (FENDNULL(mp->m_host),
+                            FENDNULL(np->m_host))  &&
+               !strcasecmp (FENDNULL(mp->m_mbox),
+                            FENDNULL(np->m_mbox))) {
                vp = vp ? add (ak->ak_name, add (",", vp))
                    : getcpy (ak->ak_name);
                mnfree (np);