Add gcc's malloc function attribute.

[nmh] / uip / aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 3e456782c67020b64217884f63a45ded769101af..1376cad7eaada9724c26d913d092e2c73ea972f2 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -27,7 +27,7 @@ char *akvalue (char *);
 char *akerror (int);
 
 static  char *akval (struct aka *, char *);
-static int aleq (char *, char *);
+static bool aleq (char *, char *);
 static char *scanp (char *);
 static char *getp (char *);
 static char *seekp (char *, char *, char **);
@@ -147,16 +147,16 @@ akval (struct aka *ak, char *s)
 }
 
 
-static int
+static bool
 aleq (char *string, char *aliasent)
 {
     char c;
 
     while ((c = *string++)) {
        if (*aliasent == '*')
-           return 1;
+           return true;
         if (tolower((unsigned char)c) != tolower((unsigned char)*aliasent))
-            return 0;
+            return false;
         aliasent++;
     }
 
@@ -194,7 +194,7 @@ alias (char *file)
                    fclose (fp);
                    return i;
                }
-               /* FALLTHRU */
+               continue;
            case ':':           /* comment */
            case ';': 
            case '#':
@@ -213,11 +213,11 @@ alias (char *file)
        }
        switch (lc) {
            case ':': 
-               ak->ak_visible = 0;
+               ak->ak_visible = false;
                break;
 
            case ';': 
-               ak->ak_visible = 1;
+               ak->ak_visible = true;
                break;
 
            default: 
@@ -348,9 +348,8 @@ getalias (char *addrs)
 
     if (cp == NULL)
        cp = addrs;
-    else
-       if (*cp == 0)
-           return (cp = NULL);
+    else if (*cp == 0)
+        return (cp = NULL);
 
     /* Remove leading any space from the address. */
     for (pp = cp; isspace ((unsigned char) *pp); pp++)
@@ -402,7 +401,7 @@ akalloc (char *id)
 
     NEW(p);
     p->ak_name = getcpy (id);
-    p->ak_visible = 0;
+    p->ak_visible = false;
     p->ak_addr = NULL;
     p->ak_next = NULL;
     if (akatail != NULL)