diff options
author | Jeff Darcy <jdarcy@redhat.com> | 2015-07-28 12:11:12 -0400 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2015-09-01 04:55:15 -0700 |
commit | 0773ca67fdb60a142207759fa6c07a69882ce59c (patch) | |
tree | 027101fce644fe17e58c78321b1632f38aaed166 /rpc/rpc-lib/src | |
parent | 038dfe57cf0c5944b0392332dbf5a00bb1208150 (diff) |
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.
Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155
BUG: 1245331
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/11769
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'rpc/rpc-lib/src')
-rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 4 | ||||
-rw-r--r-- | rpc/rpc-lib/src/rpc-transport.c | 2 | ||||
-rw-r--r-- | rpc/rpc-lib/src/rpcsvc.c | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index 11d6cedfe07..be1c5637aad 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -772,7 +772,7 @@ out: } -inline void +void rpc_clnt_set_connected (rpc_clnt_connection_t *conn) { if (!conn) { @@ -955,7 +955,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 4ade6b7d0b3..197c1682027 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -546,7 +546,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 2404a48bce7..6955d1ad328 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -320,7 +320,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) { @@ -343,7 +343,7 @@ out: } -static inline int +static int rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans, rpc_transport_t *new_trans) { @@ -1350,7 +1350,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 */ @@ -1373,7 +1373,7 @@ out: } -inline int +int rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog) { int ret = -1; @@ -1557,7 +1557,7 @@ out: } -inline int +int rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen) { if (!trans) { @@ -1568,7 +1568,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) { @@ -1817,7 +1817,7 @@ out: } -inline int +int rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t *program) { int ret = -1; |