tcpwrapper: Eliminated shadowed declaration warnings

Clean up: the use of identifiers called "access" and "daemon" shadow
function declarations in unistd.h.  Seen with "-Wextra -pedantic".

tcpwrapper.c: In function haccess_add:
tcpwrapper.c:112: warning: declaration of access shadows a global
declaration /usr/include/unistd.h:288: warning: shadowed declaration is here
tcpwrapper.c: In function good_client:
tcpwrapper.c:161: warning: declaration of daemon shadows a global declaration
/usr/include/unistd.h:953: warning: shadowed declaration is here
tcpwrapper.c: In function check_default:
tcpwrapper.c:212: warning: declaration of daemon shadows a
global declaration
/usr/include/unistd.h:953: warning: shadowed declaration is here

good_client() is used only in support/misc/tcpwrapper.c, so make it
static (and update its prototype to c99 standard form).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/include/tcpwrapper.h b/support/include/tcpwrapper.h
index 941394e3582a18af08b2744dca194cb93b59f8e1..930ec6aa1e93d737bc1d35f23831677b14dad479 100644 (file)
--- a/support/include/tcpwrapper.h
+++ b/support/include/tcpwrapper.h
@@ -5,8 +5,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-extern int good_client(char *daemon, struct sockaddr_in *addr);
 extern int from_local(const struct sockaddr *sap);
-extern int check_default(char *daemon, struct sockaddr_in *addr, u_long prog);
+extern int check_default(char *name, struct sockaddr_in *addr, u_long prog);
 
 #endif /* TCP_WRAPPER_H */

diff --git a/support/misc/tcpwrapper.c b/support/misc/tcpwrapper.c
index 6f65c1375c4b1cfa5e2b18654604f20af649ce9f..03f5dc4401761496c0fd548ead71d52f0c6ab935 100644 (file)
--- a/support/misc/tcpwrapper.c
+++ b/support/misc/tcpwrapper.c
@@ -62,9 +62,9 @@ static int check_files(void);
 #define DENY 0
 
 typedef struct _haccess_t {
-       TAILQ_ENTRY(_haccess_t) list;
-       int access;
-    struct in_addr addr;
+       TAILQ_ENTRY(_haccess_t) list;
+       int                     allowed;
+       struct in_addr          addr;
 } haccess_t;
 
 #define HASH_TABLE_SIZE 1021
@@ -73,7 +73,6 @@ typedef struct _hash_head {
 } hash_head;
 hash_head haccess_tbl[HASH_TABLE_SIZE];
 static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long);
-static void haccess_add(struct sockaddr_in *addr, u_long, int);
 
 static unsigned long
 strtoint(const char *str)
@@ -99,7 +98,8 @@ HASH(const char *addr, const unsigned long program)
        return hashint(strtoint(addr) + program);
 }
 
-void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
+static void
+haccess_add(struct sockaddr_in *addr, u_long prog, int allowed)
 {
        hash_head *head;
        haccess_t *hptr;
@@ -112,7 +112,7 @@ void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
        hash = HASH(inet_ntoa(addr->sin_addr), prog);
        head = &(haccess_tbl[hash]);
 
-       hptr->access = access;
+       hptr->allowed = allowed;
        hptr->addr.s_addr = addr->sin_addr.s_addr;
 
        if (TAILQ_EMPTY(&head->h_head))
@@ -146,14 +146,12 @@ logit(const struct sockaddr_in *sin)
                
 }
 
-int
-good_client(daemon, addr)
-char *daemon;
-struct sockaddr_in *addr;
+static int
+good_client(char *name, struct sockaddr_in *addr)
 {
        struct request_info req;
 
-       request_init(&req, RQ_DAEMON, daemon, RQ_CLIENT_SIN, addr, 0);
+       request_init(&req, RQ_DAEMON, name, RQ_CLIENT_SIN, addr, 0);
        sock_methods(&req);
 
        if (hosts_access(&req)) 
@@ -191,7 +189,7 @@ static int check_files()
 
 /**
  * check_default - additional checks for NULL, DUMP, GETPORT and unknown
- * @daemon: pointer to '\0'-terminated ASCII string containing name of the
+ * @name: pointer to '\0'-terminated ASCII string containing name of the
  *             daemon requesting the access check
  * @addr: pointer to socket address containing address of caller
  * @prog: RPC program number caller is attempting to access
@@ -199,26 +197,26 @@ static int check_files()
  * Returns TRUE if the caller is allowed access; otherwise FALSE is returned.
  */
 int
-check_default(char *daemon, struct sockaddr_in *addr, u_long prog)
+check_default(char *name, struct sockaddr_in *addr, u_long prog)
 {
        haccess_t *acc = NULL;
        int changed = check_files();
 
        acc = haccess_lookup(addr, prog);
        if (acc && changed == 0)
-               return (acc->access);
+               return acc->allowed;
 
-       if (!(from_local((struct sockaddr *)addr) || good_client(daemon, addr))) {
+       if (!(from_local((struct sockaddr *)addr) || good_client(name, addr))) {
                logit(addr);
                if (acc)
-                       acc->access = FALSE;
+                       acc->allowed = FALSE;
                else 
                        haccess_add(addr, prog, FALSE);
                return (FALSE);
        }
 
        if (acc)
-               acc->access = TRUE;
+               acc->allowed = TRUE;
        else 
                haccess_add(addr, prog, TRUE);