Imported Upstream version 1.7.6p1

[debian/sudo] / alias.c

diff --git a/alias.c b/alias.c
index b1f57e7ecafb45a12ec1ff119dd3643e9c5f0d45..238830c7bbd948d72a6d953d45cf09d9244df64c 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -69,7 +69,7 @@ alias_compare(v1, v2)
        res = 1;
     else if ((res = strcmp(a1->name, a2->name)) == 0)
        res = a1->type - a2->type;
-    return(res);
+    return res;
 }
 
 /*
@@ -95,10 +95,10 @@ alias_find(name, type)
             */
            a = node->data;
            if (a->seqno == alias_seqno)
-               return(NULL);
+               return NULL;
            a->seqno = alias_seqno;
     }
-    return(a);
+    return a;
 }
 
 /*
@@ -122,9 +122,9 @@ alias_add(name, type, members)
     if (rbinsert(aliases, a)) {
        snprintf(errbuf, sizeof(errbuf), "Alias `%s' already defined", name);
        alias_free(a);
-       return(errbuf);
+       return errbuf;
     }
-    return(NULL);
+    return NULL;
 }
 
 /*
@@ -144,7 +144,7 @@ alias_apply(func, cookie)
 int
 no_aliases()
 {
-    return(rbisempty(aliases));
+    return rbisempty(aliases);
 }
 
 /*
@@ -182,14 +182,13 @@ alias_remove(name, type)
     int type;
 {
     struct rbnode *node;
-    struct alias key, *a;
+    struct alias key;
 
     key.name = name;
     key.type = type;
     if ((node = rbfind(aliases, &key)) == NULL)
-       return(NULL);
-    a = rbdelete(aliases, node);
-    return(a);
+       return NULL;
+    return rbdelete(aliases, node);
 }
 
 void