- Fixed version-info in src/Makefile.am to reflect the correct version

- Fixed some of warnings in: src/auth_time.c, src/clnt_dg.c and
    src/clnt_raw.c
- Added some #ifdef NOTUSED around some code in src/rpbc_clnt.c
  that was not being used...

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index edab30099d11f8e83d9ca0f3c1fcc5371220f602..a76c37777222ce7dc72c3dcc41c17fb33cd01b60 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I../tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
 
 lib_LTLIBRARIES = libtirpc.la
 
-libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:8:0
+libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:9:0
 
 libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
         clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \

diff --git a/src/auth_time.c b/src/auth_time.c
index d77bcf5a77e9c4a403cd0d0cf4f0a08ee802858d..7cfbb7ea260a665ea29c9e443e81d517ad35adc5 100644 (file)
--- a/src/auth_time.c
+++ b/src/auth_time.c
@@ -248,7 +248,8 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
        nis_server              tsrv;
        void                    (*oldsig)() = NULL; /* old alarm handler */
        struct sockaddr_in      sin;
-       int                     s = RPC_ANYSOCK, len;
+       int                     s = RPC_ANYSOCK;
+       socklen_t len;
        int                     type = 0;
 
        td->tv_sec = 0;

diff --git a/src/clnt_dg.c b/src/clnt_dg.c
index 0e3574285c568852ca52977cfdd4a5750f9c973c..da01c5bda54d7e7fff4967971083af147f7f4376 100644 (file)
--- a/src/clnt_dg.c
+++ b/src/clnt_dg.c
@@ -306,7 +306,7 @@ clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
        int nrefreshes = 2;             /* number of times to refresh cred */
        struct timeval timeout;
         struct pollfd fd;
-       int total_time, nextsend_time, tv;
+       int total_time, nextsend_time, tv=0;
        struct sockaddr *sa;
        sigset_t mask;
        sigset_t newmask;

diff --git a/src/clnt_raw.c b/src/clnt_raw.c
index 36035c822389098a7b21c27a9abb5285d466a10b..f184066d16391fb69d353afe4bd107e906edca6e 100644 (file)
--- a/src/clnt_raw.c
+++ b/src/clnt_raw.c
@@ -84,8 +84,8 @@ clnt_raw_create(prog, vers)
 {
        struct clntraw_private *clp;
        struct rpc_msg call_msg;
-       XDR *xdrs = &clp->xdr_stream;
-       CLIENT  *client = &clp->client_object;
+       XDR *xdrs;
+       CLIENT  *client;
 
        mutex_lock(&clntraw_lock);
        clp = clntraw_private;
@@ -101,6 +101,8 @@ clnt_raw_create(prog, vers)
                clp->_raw_buf = __rpc_rawcombuf;
                clntraw_private = clp;
        }
+       xdrs = &clp->xdr_stream;
+       client = &clp->client_object;
        /*
         * pre-serialize the static part of the call msg and stash it away
         */

diff --git a/src/rpbc_clnt.c b/src/rpbc_clnt.c
index 75811f02aa9558879c7e78276361309437e80915..0e25747b529b10dcf9b7c60189e2592fe9b180ea 100644 (file)
--- a/src/rpbc_clnt.c
+++ b/src/rpbc_clnt.c
@@ -109,7 +109,9 @@ static void delete_cache(struct netbuf *);
 static void add_cache(const char *, const char *, struct netbuf *, char *);
 static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
 static CLIENT *local_rpcb(void);
+#if NOTUSED
 static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
+#endif
 
 /*
  * This routine adjusts the timeout used for calls to the remote rpcbind.
@@ -625,7 +627,7 @@ rpcb_unset(program, version, nconf)
        CLNT_DESTROY(client);
        return (rslt);
 }
-
+#ifdef NOTUSED
 /*
  * From the merged list, find the appropriate entry
  */
@@ -657,7 +659,7 @@ got_entry(relp, nconf)
        }
        return (na);
 }
-
+#endif
 /*
  * Quick check to see if rpcbind is up.  Tries to connect over
  * local transport.
@@ -725,7 +727,9 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
        CLIENT **clpp;
        struct timeval *tp;
 {
+#ifdef NOTUSED
        static bool_t check_rpcbind = TRUE;
+#endif
        CLIENT *client = NULL;
        RPCB parms;
        enum clnt_stat clnt_st;

diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
index 040f4ceb03393ffc175dc40977b04a87a04cc62a..ed16f00d523fae641d4700442cd19c7d29cecb21 100644 (file)
--- a/src/rpcb_clnt.c
+++ b/src/rpcb_clnt.c
@@ -109,7 +109,9 @@ static void delete_cache(struct netbuf *);
 static void add_cache(const char *, const char *, struct netbuf *, char *);
 static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
 static CLIENT *local_rpcb(void);
+#ifdef NOTUSED
 static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
+#endif
 
 /*
  * This routine adjusts the timeout used for calls to the remote rpcbind.
@@ -625,7 +627,7 @@ rpcb_unset(program, version, nconf)
        CLNT_DESTROY(client);
        return (rslt);
 }
-
+#ifdef NOTUSED
 /*
  * From the merged list, find the appropriate entry
  */
@@ -657,6 +659,7 @@ got_entry(relp, nconf)
        }
        return (na);
 }
+#endif
 
 /*
  * Quick check to see if rpcbind is up.  Tries to connect over
@@ -725,7 +728,9 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
        CLIENT **clpp;
        struct timeval *tp;
 {
+#ifdef NOTUSED
        static bool_t check_rpcbind = TRUE;
+#endif
        CLIENT *client = NULL;
        RPCB parms;
        enum clnt_stat clnt_st;