From 50ae3e67e4f294925fc840d3f83b77f7072af54d Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Wed, 18 Nov 2015 12:28:42 -0500 Subject: 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 Reviewed-on: http://review.gluster.org/12646 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- libglusterfs/src/gfdb/gfdb_sqlite3.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'libglusterfs/src/gfdb/gfdb_sqlite3.c') diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index 6611eff275c..abd96b7e68d 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -17,7 +17,7 @@ * Util functions * * ***************************************************************************/ -inline gf_sql_connection_t * +gf_sql_connection_t * gf_sql_connection_init () { gf_sql_connection_t *gf_sql_conn = NULL; @@ -33,7 +33,7 @@ gf_sql_connection_init () return gf_sql_conn; } -inline void +void gf_sql_connection_fini (gf_sql_connection_t **sql_connection) { if (!sql_connection) @@ -42,7 +42,7 @@ gf_sql_connection_fini (gf_sql_connection_t **sql_connection) *sql_connection = NULL; } -inline const char * +const char * gf_sql_jm2str (gf_sql_journal_mode_t jm) { switch (jm) { @@ -64,7 +64,7 @@ gf_sql_jm2str (gf_sql_journal_mode_t jm) return NULL; } -inline gf_sql_journal_mode_t +gf_sql_journal_mode_t gf_sql_str2jm (const char *jm_str) { if (!jm_str) { @@ -85,7 +85,7 @@ gf_sql_str2jm (const char *jm_str) return gf_sql_jm_invalid; } -inline const char * +const char * gf_sql_av_t2str (gf_sql_auto_vacuum_t sql_av) { switch (sql_av) { @@ -101,7 +101,7 @@ gf_sql_av_t2str (gf_sql_auto_vacuum_t sql_av) return NULL; } -inline gf_sql_auto_vacuum_t +gf_sql_auto_vacuum_t gf_sql_str2av_t (const char *av_str) { if (!av_str) { @@ -116,7 +116,7 @@ gf_sql_str2av_t (const char *av_str) return gf_sql_sync_invalid; } -inline const char * +const char * gf_sync_t2str (gf_sql_sync_t sql_sync) { switch (sql_sync) { @@ -132,7 +132,7 @@ gf_sync_t2str (gf_sql_sync_t sql_sync) return NULL; } -inline gf_sql_sync_t +gf_sql_sync_t gf_sql_str2sync_t (const char *sync_str) { if (!sync_str) { @@ -149,7 +149,7 @@ gf_sql_str2sync_t (const char *sync_str) /*TODO replace GF_CALLOC by mem_pool or iobuff if required for performace */ -static inline char * +static char * sql_stmt_init () { char *sql_stmt = NULL; @@ -168,7 +168,7 @@ out: } /*TODO replace GF_FREE by mem_pool or iobuff if required for performace */ -static inline void +static void sql_stmt_fini (char **sql_stmt) { GF_FREE (*sql_stmt); @@ -296,7 +296,7 @@ out: -static inline int +static int apply_sql_params_db(gf_sql_connection_t *sql_conn, dict_t *param_dict) { int ret = -1; -- cgit