[libgda] Removed compiler warnings

[Vivien Malerba <vivien src gnome org>]

commit 6961c162ffd89b5e208d385b241638701c91aa7e
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue Jan 31 17:11:27 2012 +0100

    Removed compiler warnings

 libgda/gda-data-select.c                    |    2 +-
 libgda/sqlite/gda-sqlite-util.c             |    4 ----
 libgda/thread-wrapper/gda-thread-provider.c |   13 ++++++-------
 providers/jdbc/gda-jdbc-recordset.c         |    2 +-
 providers/jdbc/jni-wrapper.c                |   25 +++++++++++++++++++++++++
 providers/mysql/gda-mysql-provider.c        |   10 ++++++++--
 providers/oracle/gda-oracle-util.c          |    4 ++++
 providers/web/gda-web-util.c                |    9 +++++++++
 8 files changed, 54 insertions(+), 15 deletions(-)
---
diff --git a/libgda/gda-data-select.c b/libgda/gda-data-select.c
index 3f0be40..3c716cf 100644
--- a/libgda/gda-data-select.c
+++ b/libgda/gda-data-select.c
@@ -1482,7 +1482,7 @@ gda_data_select_compute_modification_statements_ext (GdaDataSelect *model,
 	for (mtype = FIRST_QUERY; mtype < NB_QUERIES; mtype++) {
 		/* take into account the column type of "[+-]xxx" parameters */
 		if (modif_stmts[mtype])
-			_gda_modify_statement_param_types (modif_stmts[mtype], model);
+			_gda_modify_statement_param_types (modif_stmts[mtype], (GdaDataModel*) model);
 #ifdef GDA_DEBUG_NO
 		if (modif_stmts[mtype]) {
 			gchar *sql;
diff --git a/libgda/sqlite/gda-sqlite-util.c b/libgda/sqlite/gda-sqlite-util.c
index 9dcde02..675d60b 100644
--- a/libgda/sqlite/gda-sqlite-util.c
+++ b/libgda/sqlite/gda-sqlite-util.c
@@ -315,10 +315,6 @@ _gda_sqlite_identifier_quote (G_GNUC_UNUSED GdaServerProvider *provider, GdaConn
 			     gboolean for_meta_store, gboolean force_quotes)
 {
         GdaSqlReservedKeywordsFunc kwfunc;
-        SqliteConnectionData *cdata = NULL;
-
-        if (cnc)
-                cdata = (SqliteConnectionData*) gda_connection_internal_get_provider_data (cnc);
         kwfunc = _gda_sqlite_get_reserved_keyword_func ();
 
 	if (for_meta_store) {
diff --git a/libgda/thread-wrapper/gda-thread-provider.c b/libgda/thread-wrapper/gda-thread-provider.c
index bc0f12d..cd8f930 100644
--- a/libgda/thread-wrapper/gda-thread-provider.c
+++ b/libgda/thread-wrapper/gda-thread-provider.c
@@ -340,7 +340,7 @@ gda_thread_provider_create_connection (GdaServerProvider *provider)
 typedef struct {
 	const gchar *dsn;
 
-	const gchar *prov_name;
+	gchar *prov_name;
 	const gchar *cnc_string;
 
 	const gchar *auth_string;
@@ -398,17 +398,16 @@ create_connection_data (GdaServerProvider *provider, GdaConnection *cnc, GdaQuar
 						  dsninfo->provider);
 	}
 	else if (cnc_string) {
+		const gchar *tmp;
 		data = g_new0 (NewConnectionData, 1);
 		if (params) {
-			data->prov_name = gda_quark_list_find (params, "PROVIDER_NAME");
-			if (data->prov_name)
-				data->prov_name = g_strdup (data->prov_name);
+			tmp = gda_quark_list_find (params, "PROVIDER_NAME");
+			data->prov_name = tmp ? g_strdup (tmp) : NULL;
 		}
 		else {
 			params = gda_quark_list_new_from_string (cnc_string);
-			data->prov_name = gda_quark_list_find (params, "PROVIDER_NAME");
-			if (data->prov_name)
-				data->prov_name = g_strdup (data->prov_name);
+			tmp = gda_quark_list_find (params, "PROVIDER_NAME");
+			data->prov_name = tmp ? g_strdup (tmp) : NULL;
 			gda_quark_list_free (params);
 			params = NULL;
 		}
diff --git a/providers/jdbc/gda-jdbc-recordset.c b/providers/jdbc/gda-jdbc-recordset.c
index 098d769..70df56e 100644
--- a/providers/jdbc/gda-jdbc-recordset.c
+++ b/providers/jdbc/gda-jdbc-recordset.c
@@ -231,7 +231,7 @@ gda_jdbc_recordset_new (GdaConnection *cnc, GdaJdbcPStmt *ps, GdaSet *exec_param
 	else
 		ps = gda_jdbc_pstmt_new (NULL);
 
-	cdata = (JdbcConnectionData*) gda_connection_internal_get_provider_data_error (cnc, error);
+	cdata = (JdbcConnectionData*) gda_connection_internal_get_provider_data (cnc);
 	if (!cdata)
 		return NULL;
 
diff --git a/providers/jdbc/jni-wrapper.c b/providers/jdbc/jni-wrapper.c
index 55b9927..9eee5b5 100644
--- a/providers/jdbc/jni-wrapper.c
+++ b/providers/jdbc/jni-wrapper.c
@@ -556,12 +556,21 @@ jni_wrapper_method_call (JNIEnv *jenv, JniWrapperMethod *method, GValue *object,
 		break;
 	case 'B':
 		g_value_init (retval, G_TYPE_CHAR);
+#if GLIB_CHECK_VERSION(2,31,7)
+		if (method->is_static)
+			g_value_set_schar (retval,
+					   (*jenv)->CallStaticByteMethodV (jenv, method->klass, method->mid, args));
+		else
+			g_value_set_schar (retval,
+					   (*jenv)->CallByteMethodV (jenv, jobj, method->mid, args));
+#else
 		if (method->is_static)
 			g_value_set_char (retval,
 					  (*jenv)->CallStaticByteMethodV (jenv, method->klass, method->mid, args));
 		else
 			g_value_set_char (retval,
 					  (*jenv)->CallByteMethodV (jenv, jobj, method->mid, args));
+#endif
 		break;
 	case 'C':
 		g_value_init (retval, G_TYPE_INT); // FIXME: should be an unsigned 16 bits value
@@ -768,12 +777,21 @@ jni_wrapper_field_get (JNIEnv *jenv, JniWrapperField *field, GValue *object, GEr
 		break;
 	case 'B':
 		g_value_init (retval, G_TYPE_CHAR);
+#if GLIB_CHECK_VERSION(2,31,7)
+		if (field->is_static)
+			g_value_set_schar (retval,
+					   (*jenv)->GetStaticByteField (jenv, field->klass, field->fid));
+		else
+			g_value_set_schar (retval,
+					   (*jenv)->GetByteField (jenv, jobj, field->fid));
+#else
 		if (field->is_static)
 			g_value_set_char (retval,
 					  (*jenv)->GetStaticByteField (jenv, field->klass, field->fid));
 		else
 			g_value_set_char (retval,
 					  (*jenv)->GetByteField (jenv, jobj, field->fid));
+#endif
 		break;
 	case 'C':
 		g_value_init (retval, G_TYPE_INT); // FIXME: should be an unsigned 16 bits value
@@ -923,10 +941,17 @@ jni_wrapper_field_set (JNIEnv *jenv, JniWrapperField *field,
 	case 'B':
 		if (G_VALUE_TYPE (value) != G_TYPE_CHAR)
 			goto wrong_type;
+#if GLIB_CHECK_VERSION(2,31,7)
+		if (field->is_static)
+			(*jenv)->SetStaticByteField (jenv, field->klass, field->fid, g_value_get_schar (value));
+		else
+			(*jenv)->SetByteField (jenv, jobj, field->fid, g_value_get_schar (value));
+#else
 		if (field->is_static)
 			(*jenv)->SetStaticByteField (jenv, field->klass, field->fid, g_value_get_char (value));
 		else
 			(*jenv)->SetByteField (jenv, jobj, field->fid, g_value_get_char (value));
+#endif
 		break;
 	case 'C':
 		if (G_VALUE_TYPE (value) != G_TYPE_INT)
diff --git a/providers/mysql/gda-mysql-provider.c b/providers/mysql/gda-mysql-provider.c
index 424ad97..bd29f94 100644
--- a/providers/mysql/gda-mysql-provider.c
+++ b/providers/mysql/gda-mysql-provider.c
@@ -2468,12 +2468,18 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
 			mysql_bind_param[i].length = NULL;
 		}
 		else if (G_VALUE_TYPE (value) == G_TYPE_CHAR) {
+#if GLIB_CHECK_VERSION(2,31,7)
+			gint8 *pv;
+			pv = g_new (gint8, 1);
+			*pv = g_value_get_schar (value);
+#else
 			gchar *pv;
 			pv = g_new (gchar, 1);
-			mem_to_free = g_slist_prepend (mem_to_free, pv);
 			*pv = g_value_get_char (value);
+#endif
+			mem_to_free = g_slist_prepend (mem_to_free, pv);
 			mysql_bind_param[i].buffer_type= MYSQL_TYPE_TINY;
-			mysql_bind_param[i].buffer= pv;
+			mysql_bind_param[i].buffer = pv;
 			mysql_bind_param[i].buffer_length = sizeof (gchar);
 			mysql_bind_param[i].length = NULL;
 		}
diff --git a/providers/oracle/gda-oracle-util.c b/providers/oracle/gda-oracle-util.c
index c4b11fe..6879861 100644
--- a/providers/oracle/gda-oracle-util.c
+++ b/providers/oracle/gda-oracle-util.c
@@ -652,7 +652,11 @@ _gda_oracle_set_value (GValue *value,
 	}
 	case GDA_STYPE_CHAR: {
 		TO_IMPLEMENT; /* test that value fits in */
+#if GLIB_CHECK_VERSION(2,31,7)
+		g_value_set_schar (value, *((gint8*) ora_value->value));
+#else
 		g_value_set_char (value, *((gchar*) ora_value->value));
+#endif
 		break;
 	}
 	case GDA_STYPE_SHORT: {
diff --git a/providers/web/gda-web-util.c b/providers/web/gda-web-util.c
index 40fed1c..49b3074 100644
--- a/providers/web/gda-web-util.c
+++ b/providers/web/gda-web-util.c
@@ -338,12 +338,21 @@ start_worker (GdaConnection *cnc, WebConnectionData *cdata)
 	cdata->worker_running = TRUE;
 	gda_mutex_unlock (cdata->mutex);
 
+#if GLIB_CHECK_VERSION(2,31,7)
+	if (! g_thread_new ("web-worker", (GThreadFunc) start_worker_in_sub_thread,
+			    thdata)) {
+		g_free (thdata);
+		gda_connection_add_event_string (cnc, _("Can't start new thread"));
+		return;
+	}
+#else
 	if (! g_thread_create ((GThreadFunc) start_worker_in_sub_thread,
 			       thdata, FALSE, NULL)) {
 		g_free (thdata);
 		gda_connection_add_event_string (cnc, _("Can't start new thread"));
 		return;
 	}
+#endif
 	
 	gint nb_retries;
 	for (nb_retries = 0; nb_retries < 10; nb_retries++) {