nfs-utils: make makesock() static

Clean up:  The makesock() function can become static since it is only used in
rpcmisc.c, where it is defined.  Fix some minor nits while we're in the area:

 o  Move it so we can remove it's forward declaration.

 o  Get rid of unneeded newlines in the xlog() format strings.

 o  Use htonl(INADDR_ANY) instead of INADDR_ANY to initialize sin_addr.
    Should make no run-time difference, but is slightly more proper,
    as the standard definition of INADDR_ANY is in host byte-order.

 o  Remove the parentheses in the "return" statements.

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

diff --git a/support/include/rpcmisc.h b/support/include/rpcmisc.h
index 35c5011934183d222c8f1332e44cbbeb5ffdb29d..5814a63a9ee17f772939b9d7d7c439d078d8f24f 100644 (file)
--- a/support/include/rpcmisc.h
+++ b/support/include/rpcmisc.h
@@ -42,7 +42,6 @@ struct rpc_dtable {
        }
 
 
-int            makesock(int port, int proto);
 void           rpc_init(char *name, int prog, int vers,
                                void (*dispatch)(struct svc_req *, SVCXPRT *),
                                int defport);

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 40c21025c1e5766fc8947057afa3b1c5f34c266a..bb6820334dda88aa526c476cf5f06afcea5410cd 100644 (file)
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -39,7 +39,7 @@
 #endif
 
 static void    closedown(int sig);
-int    makesock(int port, int proto);
+static int     makesock(int port, int proto);
 
 #define _RPCSVC_CLOSEDOWN      120
 int    _rpcpmstart = 0;
@@ -166,36 +166,42 @@ int sig;
        (void) alarm(_RPCSVC_CLOSEDOWN);
 }
 
-int makesock(int port, int proto)
+/*
+ * Create listener socket for a given port
+ *
+ * Return an open network socket on success; otherwise return -1
+ * if some error occurs.
+ */
+static int
+makesock(int port, int proto)
 {
        struct sockaddr_in sin;
-       int     s;
-       int     sock_type;
-       int     val;
+       int     sock, sock_type, val;
 
        sock_type = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
-       s = socket(AF_INET, sock_type, proto);
-       if (s < 0) {
-               xlog(L_FATAL, "Could not make a socket: %s\n",
+       sock = socket(AF_INET, sock_type, proto);
+       if (sock < 0) {
+               xlog(L_FATAL, "Could not make a socket: %s",
                                        strerror(errno));
-               return (-1);
+               return -1;
        }
        memset((char *) &sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
-       sin.sin_addr.s_addr = INADDR_ANY;
+       sin.sin_addr.s_addr = htonl(INADDR_ANY);
        sin.sin_port = htons(port);
 
        val = 1;
        if (proto == IPPROTO_TCP)
-               if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+               if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
                               &val, sizeof(val)) < 0)
-                       xlog(L_ERROR, "setsockopt failed: %s\n",
+                       xlog(L_ERROR, "setsockopt failed: %s",
                             strerror(errno));
 
-       if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
-               xlog(L_FATAL, "Could not bind name to socket: %s\n",
+       if (bind(sock, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
+               xlog(L_FATAL, "Could not bind name to socket: %s",
                                        strerror(errno));
-               return (-1);
+               return -1;
        }
-       return (s);
+
+       return sock;
 }