summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/gfdb/gfdb_sqlite3.c
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-07-28 12:11:12 -0400
committerJeff Darcy <jdarcy@redhat.com>2015-09-01 04:55:15 -0700
commit0773ca67fdb60a142207759fa6c07a69882ce59c (patch)
tree027101fce644fe17e58c78321b1632f38aaed166 /libglusterfs/src/gfdb/gfdb_sqlite3.c
parent038dfe57cf0c5944b0392332dbf5a00bb1208150 (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 'libglusterfs/src/gfdb/gfdb_sqlite3.c')
-rw-r--r--libglusterfs/src/gfdb/gfdb_sqlite3.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c
index 9fd2d181c45..4b1163d3ce4 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);
@@ -288,7 +288,7 @@ out:
-static inline int
+static int
apply_sql_params_db(gf_sql_connection_t *sql_conn, dict_t *param_dict)
{
int ret = -1;