all: reduce "inline" usage

There are three kinds of inline functions: plain inline, extern inline,
and static inline.  All three have been removed from .c files, except
those in "contrib" which aren't our problem.  Inlines in .h files, which
are overwhelmingly "static inline" already, have generally been left
alone.  Over time we should be able to "lower" these into .c files, but
that has to be done in a case-by-case fashion requiring more manual
effort.  This part was easy to do automatically without (as far as I can
tell) any ill effect.

In the process, several pieces of dead code were flagged by the
compiler, and were removed.

backport of Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155,
http://review.gluster.org/11769, BUG: 1245331

Change-Id: Iba1efb0bc578ea4a5e9bf76b7bd93dc1be9eba44
BUG: 1283302
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/12646
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

5 files changed, 27 insertions, 27 deletions

diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 790436a4f2d..e6efb412561 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -777,7 +777,7 @@ out:
 }
 
 
-inline void
+void
 rpc_clnt_set_connected (rpc_clnt_connection_t *conn)
 {
         if (!conn) {
@@ -960,7 +960,7 @@ rpc_clnt_connection_deinit (rpc_clnt_connection_t *conn)
 }
 
 
-static inline int
+static int
 rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx,
                           dict_t *options, char *name)
 {
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index bf4fcad09ff..0904dbee716 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -553,7 +553,7 @@ out:
 
 
 
-inline int
+int
 rpc_transport_register_notify (rpc_transport_t *trans,
                                rpc_transport_notify_t notify, void *mydata)
 {
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 8307d2f4923..daf1932b90d 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -325,7 +325,7 @@ err:
 /* this procedure can only pass 4 arguments to registered notifyfn. To send more
  * arguments call wrapper->notify directly.
  */
-static inline void
+static void
 rpcsvc_program_notify (rpcsvc_listener_t *listener, rpcsvc_event_t event,
                        void *data)
 {
@@ -348,7 +348,7 @@ out:
 }
 
 
-static inline int
+static int
 rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans,
                rpc_transport_t *new_trans)
 {
@@ -1354,7 +1354,7 @@ rpcsvc_error_reply (rpcsvc_request_t *req)
 
 
 /* Register the program with the local portmapper service. */
-inline int
+int
 rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port)
 {
         int                ret   = -1; /* FAIL */
@@ -1377,7 +1377,7 @@ out:
 }
 
 
-inline int
+int
 rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog)
 {
         int ret = -1;
@@ -1561,7 +1561,7 @@ out:
 }
 
 
-inline int
+int
 rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen)
 {
         if (!trans) {
@@ -1572,7 +1572,7 @@ rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen)
 }
 
 
-inline int
+int
 rpcsvc_transport_peeraddr (rpc_transport_t *trans, char *addrstr, int addrlen,
                            struct sockaddr_storage *sa, socklen_t sasize)
 {
@@ -1821,7 +1821,7 @@ out:
 }
 
 
-inline int
+int
 rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t *program)
 {
         int               ret                = -1;
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index 25eef7b97ee..34972deef09 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -1733,7 +1733,7 @@ out:
 }
 
 
-static inline void
+static void
 __gf_rdma_deregister_mr (gf_rdma_device_t *device,
                          struct ibv_mr **mr, int count)
 {
@@ -2135,7 +2135,7 @@ out:
 }
 
 
-static inline void
+static void
 __gf_rdma_fill_reply_header (gf_rdma_header_t *header, struct iovec *rpchdr,
                              gf_rdma_reply_info_t *reply_info, int credits)
 {
@@ -2286,7 +2286,7 @@ out:
 }
 
 
-static inline int32_t
+static int32_t
 __gf_rdma_register_local_mr_for_rdma (gf_rdma_peer_t *peer,
                                       struct iovec *vector, int count,
                                       gf_rdma_post_context_t *ctx)
@@ -3382,7 +3382,7 @@ out:
 }
 
 
-static inline int32_t
+static int32_t
 gf_rdma_decode_error_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
                           size_t bytes_in_post)
 {
@@ -3957,7 +3957,7 @@ out:
 }
 
 
-static inline int32_t
+static int32_t
 gf_rdma_recv_request (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
                       gf_rdma_read_chunk_t *readch)
 {
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index c5ab22f9941..b3a80d9ceb1 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -1186,7 +1186,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_simple_msg (rpc_transport_t *this)
 {
         int                           ret            = 0;
@@ -1255,7 +1255,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_simple_request (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1272,7 +1272,7 @@ __socket_read_simple_request (rpc_transport_t *this)
 #define rpc_progver_addr(buf) (buf + RPC_MSGTYPE_SIZE + 8)
 #define rpc_procnum_addr(buf) (buf + RPC_MSGTYPE_SIZE + 12)
 
-static inline int
+static int
 __socket_read_vectored_request (rpc_transport_t *this, rpcsvc_vector_sizer vector_sizer)
 {
         socket_private_t *priv                   = NULL;
@@ -1444,7 +1444,7 @@ out:
         return ret;
 }
 
-static inline int
+static int
 __socket_read_request (rpc_transport_t *this)
 {
         socket_private_t *priv               = NULL;
@@ -1525,7 +1525,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_accepted_successful_reply (rpc_transport_t *this)
 {
         socket_private_t *priv              = NULL;
@@ -1652,7 +1652,7 @@ out:
 #define rpc_reply_verflen_addr(fragcurrent) ((char *)fragcurrent - 4)
 #define rpc_reply_accept_status_addr(fragcurrent) ((char *)fragcurrent - 4)
 
-static inline int
+static int
 __socket_read_accepted_reply (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
@@ -1748,7 +1748,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_denied_reply (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1758,7 +1758,7 @@ __socket_read_denied_reply (rpc_transport_t *this)
 #define rpc_reply_status_addr(fragcurrent) ((char *)fragcurrent - 4)
 
 
-static inline int
+static int
 __socket_read_vectored_reply (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
@@ -1824,7 +1824,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_simple_reply (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1832,7 +1832,7 @@ __socket_read_simple_reply (rpc_transport_t *this)
 
 #define rpc_xid_addr(buf) (buf)
 
-static inline int
+static int
 __socket_read_reply (rpc_transport_t *this)
 {
         socket_private_t   *priv         = NULL;
@@ -1907,7 +1907,7 @@ out:
 
 
 /* returns the number of bytes yet to be read in a fragment */
-static inline int
+static int
 __socket_read_frag (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
@@ -1984,7 +1984,7 @@ out:
 }
 
 
-static inline void
+static void
 __socket_reset_priv (socket_private_t *priv)
 {
         struct gf_sock_incoming   *in    = NULL;