[libgda] tests: Fix warnings.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] tests: Fix warnings.
- Date: Mon, 4 Jul 2011 10:23:23 +0000 (UTC)
commit e5713d89bbef1a2094f04c44c4adb8b1a1047c55
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Jul 4 12:21:57 2011 +0200
tests: Fix warnings.
Mostly signed/unsigned warnings.
Also made gda_handler_time_set_str_spec() public because it is
used by a test and is documented as public already.
configure.ac | 12 ++++++++++--
libgda-report/engine/test-rt-parser.c | 2 +-
.../data-entries/gdaui-data-cell-renderer-bin.c | 2 +-
.../gdaui-data-cell-renderer-textual.c | 2 +-
libgda-ui/data-entries/gdaui-entry-combo.c | 2 +-
libgda-ui/data-entries/plugins/common-pict.c | 2 ++
libgda-ui/gdaui-init.c | 2 +-
libgda-ui/gdaui-server-operation.c | 6 +++---
libgda/handlers/gda-handler-time.h | 3 ++-
libgda/sqlite/gda-sqlite-provider.c | 1 +
providers/jdbc/gda-jdbc-provider.c | 2 +-
providers/jdbc/gda-jdbc-recordset.c | 4 ++--
providers/jdbc/jni-wrapper.c | 1 +
providers/sqlcipher/Makefile.am | 5 ++++-
testing/gdaui-test-rt-editor.c | 2 ++
testing/virtual-test-2.c | 6 ++++++
tests/data-model-errors.c | 4 ++--
tests/data-models/check_data_proxy.c | 2 +-
tests/data-models/check_model_errors.c | 7 +++++--
tests/data-models/check_pmodel.c | 2 +-
tests/multi-threading/check_cnc_lock.c | 6 +++---
tests/multi-threading/check_mutex.c | 2 +-
tests/multi-threading/check_threaded_cnc.c | 10 +++++-----
tests/multi-threading/check_wrapper.c | 6 +++---
tests/multi-threading/dummy-object.c | 3 ++-
tests/parser/check_rewrite_for_default.c | 2 +-
tests/parser/check_script.c | 2 +-
tests/providers/prov-test-util.c | 2 +-
tests/test-bin-converter.c | 2 +-
tests/test-connection-string-split.c | 2 +-
tests/test-identifiers-quotes.c | 2 +-
tests/test-input-parsers.c | 18 +++++++++---------
tests/test-sql-builder.c | 4 ++--
tests/test-sql-identifier.c | 2 +-
tests/value-holders/check_holder.c | 4 ++--
tests/value-holders/check_set.c | 8 +++++---
tests/value-holders/check_statement.c | 6 +++---
tools/browser/canvas/browser-canvas.c | 4 ++++
tools/browser/data-manager/data-source-manager.c | 2 +-
tools/browser/data-manager/data-widget.c | 2 +-
tools/browser/ldap-browser/mgr-ldap-entries.c | 2 +-
tools/browser/query-exec/query-editor.c | 4 ++--
42 files changed, 99 insertions(+), 65 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9a2034d..9bb9033 100644
--- a/configure.ac
+++ b/configure.ac
@@ -797,10 +797,18 @@ AC_ARG_ENABLE(default-binary,
AM_CONDITIONAL(DEFAULT_BINARY, test "x$enable_default_binary" = xyes)
+# We use -Wno-address because SQLITE3_CALL() has an ifdefed definition that
+# makes it hard to always avoid the warning.
+# We use -Wno-unused-variable because the lemon parser generator (in libgda's sources),
+# creates some generic macros that declare variables that are not always used.
+# We use -Wno-unused-parameter because the lemon parser generator (in libgda's sources),
+# produces generic code, and it's hard to fix that generated code.
+# We use -Wno-pointer-sign because the sqlite source code (copied into libgda's sources)
+# has problems but we do not want to patch that code.
DK_ARG_ENABLE_WARNINGS([COREDEPS_WFLAGS],
[-Wall],
- [-Wall -Wextra],
- [PANGO G GDK GDK_PIXBUF GTK])
+ [-Wall -Wextra -Wno-address -Wno-unused-variable -Wno-unused-parameter -Wno-pointer-sign],
+ [PANGO G GDK_PIXBUF])
AC_SUBST(COREDEPS_CFLAGS)
AC_SUBST(COREDEPS_LIBS)
diff --git a/libgda-report/engine/test-rt-parser.c b/libgda-report/engine/test-rt-parser.c
index 3f6fadb..135c506 100644
--- a/libgda-report/engine/test-rt-parser.c
+++ b/libgda-report/engine/test-rt-parser.c
@@ -77,7 +77,7 @@ TestCase test_cases[] = {
int
main (int argc, char **argv)
{
- gint i;
+ guint i;
for (i = 0; i < (sizeof (test_cases) / sizeof (TestCase)); i++) {
TestCase *test = (TestCase*) &(test_cases[i]);
diff --git a/libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c b/libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c
index 19d43c8..ac625b4 100644
--- a/libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c
@@ -467,7 +467,7 @@ gdaui_data_cell_renderer_bin_activate (GtkCellRenderer *cell,
common_bin_adjust_menu (&(bincell->priv->menu), bincell->priv->editable,
value);
g_object_set_data (G_OBJECT (bincell->priv->menu.popup), "__event", event);
- g_object_set_data (G_OBJECT (bincell->priv->menu.popup), "__rect", cell_area);
+ g_object_set_data (G_OBJECT (bincell->priv->menu.popup), "__rect", (GdkRectangle*)cell_area);
gtk_widget_show (bincell->priv->menu.popup);
}
gtk_tree_path_free (tpath);
diff --git a/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c b/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
index ad927cd..3589e73 100644
--- a/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
@@ -458,7 +458,7 @@ gdaui_data_cell_renderer_textual_set_property (GObject *object,
str = gda_data_handler_get_str_from_value (datacell->priv->dh, gval);
gboolean use_markup = FALSE;
if (str) {
- gint length;
+ guint length;
length = g_utf8_strlen (str, -1);
if (length > MAX_ACCEPTED_STRING_LENGTH + too_long_msg_len) {
gchar *tmp;
diff --git a/libgda-ui/data-entries/gdaui-entry-combo.c b/libgda-ui/data-entries/gdaui-entry-combo.c
index d47bf36..54f8173 100644
--- a/libgda-ui/data-entries/gdaui-entry-combo.c
+++ b/libgda-ui/data-entries/gdaui-entry-combo.c
@@ -828,7 +828,7 @@ gdaui_entry_combo_set_attributes (GdauiDataEntry *iface, guint attrs, guint mask
/* Can be NULL ? */
if (mask & GDA_VALUE_ATTR_CAN_BE_NULL)
- if (combo->priv->null_possible != (attrs & GDA_VALUE_ATTR_CAN_BE_NULL) ? TRUE : FALSE) {
+ if (combo->priv->null_possible != (gboolean)(attrs & GDA_VALUE_ATTR_CAN_BE_NULL) ? TRUE : FALSE) {
combo->priv->null_possible = (attrs & GDA_VALUE_ATTR_CAN_BE_NULL) ? TRUE : FALSE;
gdaui_combo_add_null (GDAUI_COMBO (combo->priv->combo_entry),
combo->priv->null_possible);
diff --git a/libgda-ui/data-entries/plugins/common-pict.c b/libgda-ui/data-entries/plugins/common-pict.c
index 1b1f45d..f85696b 100644
--- a/libgda-ui/data-entries/plugins/common-pict.c
+++ b/libgda-ui/data-entries/plugins/common-pict.c
@@ -285,6 +285,7 @@ static void file_load_cb (GtkWidget *button, PictMenuData *menudata);
static void file_save_cb (GtkWidget *button, PictMenuData *menudata);
static void copy_cb (GtkWidget *button, PictMenuData *menudata);
+/* Commented out because it's not used:
static void
menudata_free (PictMenuData *menudata)
{
@@ -294,6 +295,7 @@ menudata_free (PictMenuData *menudata)
}
g_free (menudata);
}
+*/
void
common_pict_create_menu (PictMenu *pictmenu, GtkWidget *attach_to, PictBinData *bindata, PictOptions *options,
diff --git a/libgda-ui/gdaui-init.c b/libgda-ui/gdaui-init.c
index b2214a7..b814f11 100644
--- a/libgda-ui/gdaui-init.c
+++ b/libgda-ui/gdaui-init.c
@@ -134,7 +134,7 @@ gdaui_new_data_entry (GType type, const gchar *plugin_name)
if (plugin_struct && plugin_struct->entry_create_func) {
gboolean allok = TRUE;
if (plugin_struct->nb_g_types > 0) {
- gint i;
+ guint i;
for (i = 0; i < plugin_struct->nb_g_types; i++) {
if (plugin_struct->valid_g_types[i] == type)
break;
diff --git a/libgda-ui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
index b87f6cb..168eff2 100644
--- a/libgda-ui/gdaui-server-operation.c
+++ b/libgda-ui/gdaui-server-operation.c
@@ -940,7 +940,7 @@ sequence_item_added_cb (GdaServerOperation *op, const gchar *seq_path, gint item
}
/* move children DOWN if necessary and change the "_index" property */
- if (top_attach >= item_index) {
+ if (top_attach >= (guint)item_index) {
struct MoveChild *mc;
gint index;
@@ -1016,7 +1016,7 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
guint top_attach;
gtk_container_child_get (GTK_CONTAINER (table), child,
"top-attach", &top_attach, NULL);
- if (top_attach == item_index) {
+ if (top_attach == (guint)item_index) {
gtk_widget_destroy (child);
g_list_free (children);
children = gtk_container_get_children (GTK_CONTAINER (table));
@@ -1046,7 +1046,7 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
}
/* move widgets UP if necessary and change the "_index" property */
- if (top_attach > item_index) {
+ if (top_attach > (guint)item_index) {
struct MoveChild *mc;
gint index;
diff --git a/libgda/handlers/gda-handler-time.h b/libgda/handlers/gda-handler-time.h
index dcb41b0..a4d29ac 100644
--- a/libgda/handlers/gda-handler-time.h
+++ b/libgda/handlers/gda-handler-time.h
@@ -69,7 +69,8 @@ GdaDataHandler *gda_handler_time_new (void);
GdaDataHandler *gda_handler_time_new_no_locale (void);
void gda_handler_time_set_sql_spec (GdaHandlerTime *dh, GDateDMY first, GDateDMY sec,
GDateDMY third, gchar separator, gboolean twodigits_years);
-
+void gda_handler_time_set_str_spec (GdaHandlerTime *dh, GDateDMY first, GDateDMY sec,
+ GDateDMY third, gchar separator, gboolean twodigits_years);
gchar *gda_handler_time_get_no_locale_str_from_value (GdaHandlerTime *dh, const GValue *value);
gchar *gda_handler_time_get_format (GdaHandlerTime *dh, GType type);
diff --git a/libgda/sqlite/gda-sqlite-provider.c b/libgda/sqlite/gda-sqlite-provider.c
index b6222fa..57a6bb0 100644
--- a/libgda/sqlite/gda-sqlite-provider.c
+++ b/libgda/sqlite/gda-sqlite-provider.c
@@ -852,6 +852,7 @@ gda_sqlite_provider_open_connection (GdaServerProvider *provider, GdaConnection
#ifdef SQLITE_HAS_CODEC
/* TODO Fix this compiler warning: the address of 'sqlite3_key' will always evaluate as 'true' */
+ /* We disable this warning in the meantime with -Wno-address */
if (auth)
passphrase = gda_quark_list_find (auth, "PASSWORD");
diff --git a/providers/jdbc/gda-jdbc-provider.c b/providers/jdbc/gda-jdbc-provider.c
index 02700ae..0d75142 100644
--- a/providers/jdbc/gda-jdbc-provider.c
+++ b/providers/jdbc/gda-jdbc-provider.c
@@ -1148,7 +1148,7 @@ gda_jdbc_provider_statement_prepare (GdaServerProvider *provider, GdaConnection
GValue *jexec_res;
jexec_res = jni_wrapper_method_call (jenv, GdaJPStmt__declareParamTypes,
- pstmt_obj, NULL, NULL, error, (jlong) cnc, jtypes);
+ pstmt_obj, NULL, NULL, error, (jlong)GPOINTER_TO_INT(cnc), jtypes);
(*jenv)->DeleteLocalRef (jenv, jtypes);
g_free (ctypes);
diff --git a/providers/jdbc/gda-jdbc-recordset.c b/providers/jdbc/gda-jdbc-recordset.c
index 75dde5d..bb0722d 100644
--- a/providers/jdbc/gda-jdbc-recordset.c
+++ b/providers/jdbc/gda-jdbc-recordset.c
@@ -369,7 +369,7 @@ gda_jdbc_recordset_new (GdaConnection *cnc, GdaJdbcPStmt *ps, GdaSet *exec_param
}
jexec_res = jni_wrapper_method_call (jenv, GdaJResultSet__declareColumnTypes,
- rs_value, &error_code, &sql_state, &error, (jlong) cnc, jtypes);
+ rs_value, &error_code, &sql_state, &error, (jlong)GPOINTER_TO_INT(cnc), jtypes);
(*jenv)->DeleteLocalRef (jenv, jtypes);
g_free (ctypes);
@@ -413,7 +413,7 @@ fetch_next_jdbc_row (GdaJdbcRecordset *model, JNIEnv *jenv, gboolean do_store, G
prow = gda_row_new (_GDA_PSTMT (ps)->ncols);
jexec_res = jni_wrapper_method_call (jenv, GdaJResultSet__fillNextRow,
- model->priv->rs_value, &error_code, &sql_state, &lerror, (jlong) prow);
+ model->priv->rs_value, &error_code, &sql_state, &lerror, (jlong)GPOINTER_TO_INT(prow));
if (!jexec_res) {
if (error && lerror)
*error = g_error_copy (lerror);
diff --git a/providers/jdbc/jni-wrapper.c b/providers/jdbc/jni-wrapper.c
index c425a48..57537c2 100644
--- a/providers/jdbc/jni-wrapper.c
+++ b/providers/jdbc/jni-wrapper.c
@@ -19,6 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
#include <jni-wrapper.h>
+#include <gda-value.h>
gboolean jni_wrapper_describe_exceptions = TRUE;
diff --git a/providers/sqlcipher/Makefile.am b/providers/sqlcipher/Makefile.am
index 3b4d0a6..b30b9b8 100644
--- a/providers/sqlcipher/Makefile.am
+++ b/providers/sqlcipher/Makefile.am
@@ -1,13 +1,16 @@
providerdir=$(libdir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/providers
provider_LTLIBRARIES = libgda-sqlcipher.la
+# We don't use $(COREDEPS_WFLAGS) because we use a copy of the sqlite sources,
+# which we don't want to fix ourselves.
+# TODO: Report sqlite warnings upstream so we can use warnings for the rest
+# of our source code here too.
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
$(COREDEPS_CFLAGS) \
- $(COREDEPS_WFLAGS) \
$(LIBCRYPTO_CFLAGS) \
$(sqliteinc) \
-DSQLITE_HAS_CODEC -DSQLITE_API= -DSQLITE_PRIVATE= -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_THREADSAFE=1 -DSQLITE_OMIT_LOAD_EXTENSION=1
diff --git a/testing/gdaui-test-rt-editor.c b/testing/gdaui-test-rt-editor.c
index 54df188..b9f178d 100644
--- a/testing/gdaui-test-rt-editor.c
+++ b/testing/gdaui-test-rt-editor.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <libgda-ui/gdaui-rt-editor.h>
+#ifdef GDA_DEBUG
static gboolean
texttags_equal (GtkTextTag *tag1, GtkTextTag *tag2)
{
@@ -104,6 +105,7 @@ textbuffers_equal (GtkTextBuffer *buffer1, GtkTextBuffer *buffer2, GError **erro
}
return TRUE;
}
+#endif
static void
copy_cb (GtkButton *button, GdauiRtEditor *from)
diff --git a/testing/virtual-test-2.c b/testing/virtual-test-2.c
index 085dfaa..fea44a6 100644
--- a/testing/virtual-test-2.c
+++ b/testing/virtual-test-2.c
@@ -24,7 +24,11 @@
#include <string.h>
/* utility functions */
+
+/* Commented out because it is not used.
static void run_sql_non_select (GdaConnection *cnc, const gchar *sql);
+*/
+
static GdaDataModel *run_sql_select (GdaConnection *cnc, const gchar *sql);
static gint run_and_show_sql_select (GdaConnection *cnc, const gchar *sql, const gchar *title);
int
@@ -111,6 +115,7 @@ run_sql_select (GdaConnection *cnc, const gchar *sql)
return res;
}
+/* Commented out because it is not used.
static void
run_sql_non_select (GdaConnection *cnc, const gchar *sql)
{
@@ -128,3 +133,4 @@ run_sql_non_select (GdaConnection *cnc, const gchar *sql)
if (nrows == -1)
g_error ("NON SELECT error: %s\n", error && error->message ? error->message : "no detail");
}
+*/
diff --git a/tests/data-model-errors.c b/tests/data-model-errors.c
index 2510312..aa60ff7 100644
--- a/tests/data-model-errors.c
+++ b/tests/data-model-errors.c
@@ -329,7 +329,7 @@ data_model_errors_get_value_at (GdaDataModel *model, gint col, gint row, GError
return NULL;
}
- if (row >= imodel->priv->rows->len) {
+ if (row >= (gint)imodel->priv->rows->len) {
gchar *str;
if (imodel->priv->rows->len > 0)
str = g_strdup_printf ("Row %d out of range (0-%d)", row,
@@ -438,7 +438,7 @@ data_model_errors_remove_row (GdaDataModel *model, gint row, GError **error)
imodel = (DataModelErrors *) model;
g_return_val_if_fail (imodel->priv, FALSE);
- if (row >= imodel->priv->rows->len) {
+ if (row >= (gint)imodel->priv->rows->len) {
gchar *str;
if (imodel->priv->rows->len > 0)
str = g_strdup_printf ("Row %d out of range (0-%d)", row,
diff --git a/tests/data-models/check_data_proxy.c b/tests/data-models/check_data_proxy.c
index 950421c..64a8f9f 100644
--- a/tests/data-models/check_data_proxy.c
+++ b/tests/data-models/check_data_proxy.c
@@ -1267,7 +1267,7 @@ typedef struct {
GArray *expected_signals;
const gchar *expected_signals_name;
-gint expected_signals_index;
+guint expected_signals_index;
/* Format is "<nb><type><row_nb>[/...]"
* for example:
diff --git a/tests/data-models/check_model_errors.c b/tests/data-models/check_model_errors.c
index cb8849e..d19e138 100644
--- a/tests/data-models/check_model_errors.c
+++ b/tests/data-models/check_model_errors.c
@@ -44,7 +44,7 @@ TestFunc tests[] = {
int
main (int argc, char **argv)
{
- gint i, ntests = 0, number_failed = 0;
+ guint i, ntests = 0, number_failed = 0;
gda_init ();
@@ -63,7 +63,7 @@ main (int argc, char **argv)
return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
-
+/* Commented out because it is not used:
static GdaStatement *
stmt_from_string (const gchar *sql)
{
@@ -83,6 +83,7 @@ stmt_from_string (const gchar *sql)
}
return stmt;
}
+*/
static gboolean
check_iter_contents (GdaDataModel *model, GdaDataModelIter *iter)
@@ -220,6 +221,7 @@ dump_data_model (GdaDataModel *model)
gda_data_model_dump (model, stdout);
}
+/* Commented out because it is not used.
static gboolean
compare_data_models (GdaDataModel *model1, GdaDataModel *model2, GError **error)
{
@@ -257,3 +259,4 @@ compare_data_models (GdaDataModel *model1, GdaDataModel *model2, GError **error)
g_propagate_error (error, lerror);
return FALSE;
}
+*/
diff --git a/tests/data-models/check_pmodel.c b/tests/data-models/check_pmodel.c
index dc68303..50028e7 100644
--- a/tests/data-models/check_pmodel.c
+++ b/tests/data-models/check_pmodel.c
@@ -104,7 +104,7 @@ TestFunc tests[] = {
int
main (int argc, char **argv)
{
- gint i, ntests = 0, number_failed = 0;
+ guint i, ntests = 0, number_failed = 0;
GdaConnection *cnc;
gda_init ();
diff --git a/tests/multi-threading/check_cnc_lock.c b/tests/multi-threading/check_cnc_lock.c
index ce0f5bc..78f581e 100644
--- a/tests/multi-threading/check_cnc_lock.c
+++ b/tests/multi-threading/check_cnc_lock.c
@@ -55,10 +55,10 @@ main (int argc, char** argv)
}
g_free (fname);
- gint failures = 0;
- gint j, ntests = 0;;
+ guint failures = 0;
+ guint j, ntests = 0;;
for (j = 0; j < 500; j++) {
- gint i;
+ guint i;
#ifdef DEBUG_PRINT
g_print ("================================================== test %d\n", j);
diff --git a/tests/multi-threading/check_mutex.c b/tests/multi-threading/check_mutex.c
index 2394a09..a84403a 100644
--- a/tests/multi-threading/check_mutex.c
+++ b/tests/multi-threading/check_mutex.c
@@ -47,7 +47,7 @@ main (int argc, char** argv)
gint failures = 0;
gint j, ntests = 0;;
for (j = 0; j < 10; j++) {
- gint i;
+ guint i;
for (i = 0; i < sizeof (tests) / sizeof (TestFunc); i++) {
GError *error = NULL;
diff --git a/tests/multi-threading/check_threaded_cnc.c b/tests/multi-threading/check_threaded_cnc.c
index 7b6a282..0aaefc2 100644
--- a/tests/multi-threading/check_threaded_cnc.c
+++ b/tests/multi-threading/check_threaded_cnc.c
@@ -188,7 +188,7 @@ test_select (GdaConnection *cnc, GdaConnection *tcnc)
g_object_unref (m2);
/* check iter's contents */
- gint ncols;
+ guint ncols;
ncols = g_slist_length (GDA_SET (titer)->holders);
if (ncols != g_slist_length (GDA_SET (iter)->holders)) {
g_print ("ERROR: threaded iterator is at the wrong number of columns: "
@@ -221,7 +221,7 @@ test_select (GdaConnection *cnc, GdaConnection *tcnc)
break;
}
if (ncols > 0) {
- gint i;
+ guint i;
for (i = 0; i < ncols; i++) {
const GValue *cv, *tcv;
cv = gda_data_model_iter_get_value_at (iter, i);
@@ -264,7 +264,7 @@ test_select (GdaConnection *cnc, GdaConnection *tcnc)
break;
}
if (ncols > 0) {
- gint i;
+ guint i;
for (i = 0; i < ncols; i++) {
const GValue *cv, *tcv;
cv = gda_data_model_iter_get_value_at (iter, i);
@@ -354,7 +354,7 @@ test_select_cursor (GdaConnection *cnc, GdaConnection *tcnc)
g_object_unref (m2);
/* check iter's contents */
- gint ncols;
+ guint ncols;
ncols = g_slist_length (GDA_SET (titer)->holders);
if (ncols != g_slist_length (GDA_SET (iter)->holders)) {
g_print ("ERROR: threaded iterator is at the wrong number of columns: "
@@ -386,7 +386,7 @@ test_select_cursor (GdaConnection *cnc, GdaConnection *tcnc)
break;
}
if (ncols > 0) {
- gint i;
+ guint i;
for (i = 0; i < ncols; i++) {
const GValue *cv, *tcv;
cv = gda_data_model_iter_get_value_at (iter, i);
diff --git a/tests/multi-threading/check_wrapper.c b/tests/multi-threading/check_wrapper.c
index dab23fe..8e13f11 100644
--- a/tests/multi-threading/check_wrapper.c
+++ b/tests/multi-threading/check_wrapper.c
@@ -361,7 +361,7 @@ compare_signals_lists (GSList *explist, GSList *gotlist)
es->name, gs->n_param_values);
return FALSE;
}
- gint i;
+ guint i;
for (i = 0; i < es->n_param_values; i++) {
GValue *ev, *gv;
ev = es->param_values + i;
@@ -379,7 +379,7 @@ compare_signals_lists (GSList *explist, GSList *gotlist)
g_print ("Error: Some signals have not been received:\n");
for (; elist; elist = elist->next) {
TestSignal *es = (TestSignal*) elist->data;
- gint i;
+ guint i;
g_print ("\tSignal: %s", es->name);
for (i = 0; i < es->n_param_values; i++)
g_print (" %s", gda_value_stringify (es->param_values + i));
@@ -392,7 +392,7 @@ compare_signals_lists (GSList *explist, GSList *gotlist)
g_print ("Error: Received too many signals:\n");
for (; glist; glist = glist->next) {
TestSignal *gs = (TestSignal*) glist->data;
- gint i;
+ guint i;
g_print ("\tSignal: %s", gs->name);
for (i = 0; i < gs->n_param_values; i++)
g_print (" %s", gda_value_stringify (gs->param_values + i));
diff --git a/tests/multi-threading/dummy-object.c b/tests/multi-threading/dummy-object.c
index aaaf7cf..fd33a0d 100644
--- a/tests/multi-threading/dummy-object.c
+++ b/tests/multi-threading/dummy-object.c
@@ -55,7 +55,8 @@ dummy_object_get_type (void)
NULL,
sizeof (DummyObject),
0,
- (GInstanceInitFunc) dummy_object_init
+ (GInstanceInitFunc) dummy_object_init,
+ NULL
};
g_static_mutex_lock (®istering);
diff --git a/tests/parser/check_rewrite_for_default.c b/tests/parser/check_rewrite_for_default.c
index 6756867..8a2db3c 100644
--- a/tests/parser/check_rewrite_for_default.c
+++ b/tests/parser/check_rewrite_for_default.c
@@ -102,7 +102,7 @@ int main()
GdaSet *params;
GdaHolder *h;
GValue *value;
- gint i;
+ guint i;
gint n_errors = 0;
parser = gda_sql_parser_new ();
diff --git a/tests/parser/check_script.c b/tests/parser/check_script.c
index 5cca855..7e00e2c 100644
--- a/tests/parser/check_script.c
+++ b/tests/parser/check_script.c
@@ -145,7 +145,7 @@ do_test (GdaSqlParser *parser, const xmlChar *id, const xmlChar *file, xmlNodePt
else {
const GSList *stmt_list;
xmlNodePtr snode;
- gint nb_stmt = 0;
+ guint nb_stmt = 0;
stmt_list = gda_batch_get_statements (batch);
diff --git a/tests/providers/prov-test-util.c b/tests/providers/prov-test-util.c
index 1f8c86a..7c5cc60 100644
--- a/tests/providers/prov-test-util.c
+++ b/tests/providers/prov-test-util.c
@@ -286,7 +286,7 @@ iter_is_correct (GdaDataModelIter *iter, GdaDataModel *ref_model)
g_object_get (G_OBJECT (iter), "current-row", &rownum, NULL);
cols = gda_data_model_get_n_columns (ref_model);
- if (cols != g_slist_length (GDA_SET (iter)->holders)) {
+ if (cols != (gint)g_slist_length (GDA_SET (iter)->holders)) {
#ifdef CHECK_EXTRA_INFO
g_warning ("Number of columns in iter is not the same as for the referenced data model\n");
#endif
diff --git a/tests/test-bin-converter.c b/tests/test-bin-converter.c
index 5135024..4012ea4 100644
--- a/tests/test-bin-converter.c
+++ b/tests/test-bin-converter.c
@@ -64,6 +64,6 @@ main (int argc, char** argv)
gda_binary_free (bin2);
g_free (bin_data);
- g_print ("Ok (file size: %ld)\n", bin_length);
+ g_print ("Ok (file size: %d)\n", bin_length);
return EXIT_SUCCESS;
}
diff --git a/tests/test-connection-string-split.c b/tests/test-connection-string-split.c
index 10acffb..7e4d279 100644
--- a/tests/test-connection-string-split.c
+++ b/tests/test-connection-string-split.c
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
g_type_init();
gda_init ();
- gint i;
+ guint i;
for (i = 0; i < sizeof (the_tests) / sizeof (ATest); i++) {
ATest test = the_tests[i];
gchar *cnc_params, *prov, *user, *pass;
diff --git a/tests/test-identifiers-quotes.c b/tests/test-identifiers-quotes.c
index 4626910..57ae603 100644
--- a/tests/test-identifiers-quotes.c
+++ b/tests/test-identifiers-quotes.c
@@ -158,7 +158,7 @@ int
main (int argc, char** argv)
{
gda_init ();
- gint i, nfailed = 0;
+ guint i, nfailed = 0;
for (i = 0; i < G_N_ELEMENTS (tests); i++) {
ATest *test = &(tests [i]);
gchar *result;
diff --git a/tests/test-input-parsers.c b/tests/test-input-parsers.c
index 57b4e41..7df1813 100644
--- a/tests/test-input-parsers.c
+++ b/tests/test-input-parsers.c
@@ -58,9 +58,9 @@ main (int argc, char** argv)
typedef struct {
gchar *in_string;
gboolean exp_retval;
- gint exp_day;
- gint exp_month;
- gint exp_year;
+ guint exp_day;
+ guint exp_month;
+ gint exp_year;
} TestDate;
TestDate datedata[] = {
@@ -88,7 +88,7 @@ TestDate datedata[] = {
static gboolean
test_parse_iso8601_date (void)
{
- gint i;
+ guint i;
for (i = 0; i < sizeof (datedata) / sizeof (TestDate); i++) {
TestDate td = datedata[i];
@@ -150,7 +150,7 @@ TestTime timedata[] = {
static gboolean
test_parse_iso8601_time (void)
{
- gint i;
+ guint i;
for (i = 0; i < sizeof (timedata) / sizeof (TestTime); i++) {
TestTime td = timedata[i];
@@ -185,7 +185,7 @@ test_parse_iso8601_time (void)
static gboolean
test_parse_iso8601_timestamp (void)
{
- gint idate, itime;
+ guint idate, itime;
for (idate = 0; idate < sizeof (datedata) / sizeof (TestTime); idate++) {
TestDate td = datedata [idate];
@@ -236,7 +236,7 @@ static gboolean
test_date_handler (void)
{
GdaDataHandler *dh;
- gint i;
+ guint i;
dh = gda_handler_time_new_no_locale ();
gda_handler_time_set_str_spec (GDA_HANDLER_TIME (dh),
G_DATE_YEAR, G_DATE_MONTH, G_DATE_DAY, '-', FALSE);
@@ -308,7 +308,7 @@ static gboolean
test_time_handler (void)
{
GdaDataHandler *dh;
- gint i, j;
+ guint i, j;
dh = gda_data_handler_get_default (GDA_TYPE_TIME);
g_assert (dh);
@@ -399,7 +399,7 @@ static gboolean
test_timestamp_handler (void)
{
GdaDataHandler *dh;
- gint idate, itime, itime2;
+ guint idate, itime, itime2;
dh = gda_handler_time_new_no_locale ();
gda_handler_time_set_str_spec (GDA_HANDLER_TIME (dh),
G_DATE_YEAR, G_DATE_MONTH, G_DATE_DAY, '-', FALSE);
diff --git a/tests/test-sql-builder.c b/tests/test-sql-builder.c
index 42c8371..c1d3f8c 100644
--- a/tests/test-sql-builder.c
+++ b/tests/test-sql-builder.c
@@ -66,7 +66,7 @@ int
main (int argc, char** argv)
{
gda_init ();
- gint i, nfailed = 0;
+ guint i, nfailed = 0;
for (i = 0; i < G_N_ELEMENTS (tests); i++) {
ATest *test = &(tests [i]);
GdaSqlStatement *stmt;
@@ -617,7 +617,7 @@ build13 (void)
gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 234), 0);
gda_sql_builder_add_field_value_id (b,
gda_sql_builder_add_expr (b, NULL, G_TYPE_BOOLEAN, TRUE), 0);
- GdaNumeric numval = {"123.4567890", 0, 0};
+ GdaNumeric numval = {"123.4567890", 0, 0, NULL};
gda_sql_builder_add_field_value_id (b,
gda_sql_builder_add_expr (b, NULL, GDA_TYPE_NUMERIC, &numval), 0);
GDate *date = g_date_new_dmy (27, G_DATE_MAY, 1972);
diff --git a/tests/test-sql-identifier.c b/tests/test-sql-identifier.c
index a37f909..86e9bd7 100644
--- a/tests/test-sql-identifier.c
+++ b/tests/test-sql-identifier.c
@@ -78,7 +78,7 @@ identifier_needs_quotes (const gchar *str)
int
main (int argc, char** argv)
{
- gint i, nfailed = 0;
+ guint i, nfailed = 0;
for (i = 0; i < G_N_ELEMENTS (tests); i++) {
ATest *test = &(tests [i]);
if (identifier_needs_quotes (test->sql_identifier) != test->need_quotes) {
diff --git a/tests/value-holders/check_holder.c b/tests/value-holders/check_holder.c
index 5f1ebed..37b11ba 100644
--- a/tests/value-holders/check_holder.c
+++ b/tests/value-holders/check_holder.c
@@ -75,8 +75,8 @@ main (int argc, char** argv)
g_type_init ();
gda_init ();
- gint failures = 0;
- gint i, ntests = 0;
+ guint failures = 0;
+ guint i, ntests = 0;
for (i = 0; i < sizeof (tests) / sizeof (TestFunc); i++) {
GError *error = NULL;
diff --git a/tests/value-holders/check_set.c b/tests/value-holders/check_set.c
index fbdd2f6..9dc1e1c 100644
--- a/tests/value-holders/check_set.c
+++ b/tests/value-holders/check_set.c
@@ -32,7 +32,7 @@ typedef struct {
static void emitted_signal_add (EmittedSignal *es);
static void emitted_signals_reset (void);
static gboolean emitted_signals_find (gpointer obj, const gchar *signal_name, GError **error);
-static gboolean emitted_signals_notfind (gpointer obj, const gchar *signal_name, GError **error);
+/* Not used: static gboolean emitted_signals_notfind (gpointer obj, const gchar *signal_name, GError **error); */
static gboolean emitted_signals_chech_empty (gpointer obj, const gchar *signal_name, GError **error);
static void emitted_signals_monitor_set (GdaSet *set);
@@ -61,8 +61,8 @@ main (int argc, char** argv)
g_type_init ();
gda_init ();
- gint failures = 0;
- gint i, ntests = 0;
+ guint failures = 0;
+ guint i, ntests = 0;
data = tests_common_load_data ("set.data");
for (i = 0; i < sizeof (tests) / sizeof (TestFunc); i++) {
@@ -434,6 +434,7 @@ emitted_signals_find (gpointer obj, const gchar *signal_name, GError **error)
return FALSE;
}
+/* Commented out because it is not used.
static gboolean
emitted_signals_notfind (gpointer obj, const gchar *signal_name, GError **error)
{
@@ -451,6 +452,7 @@ emitted_signals_notfind (gpointer obj, const gchar *signal_name, GError **error)
}
return TRUE;
}
+*/
static gboolean
emitted_signals_chech_empty (gpointer obj, const gchar *signal_name, GError **error)
diff --git a/tests/value-holders/check_statement.c b/tests/value-holders/check_statement.c
index 6389ef8..5af8f71 100644
--- a/tests/value-holders/check_statement.c
+++ b/tests/value-holders/check_statement.c
@@ -42,8 +42,8 @@ main (int argc, char** argv)
g_type_init ();
gda_init ();
- gint failures = 0;
- gint i, ntests = 0;
+ guint failures = 0;
+ guint i, ntests = 0;
data = tests_common_load_data ("stmt.data");
for (i = 0; i < sizeof (tests) / sizeof (TestFunc); i++) {
@@ -84,7 +84,7 @@ static gboolean
test1 (GError **error)
{
GdaSqlParser *parser;
- gint i;
+ guint i;
parser = gda_sql_parser_new ();
diff --git a/tools/browser/canvas/browser-canvas.c b/tools/browser/canvas/browser-canvas.c
index 67411b7..13fd8cb 100644
--- a/tools/browser/canvas/browser-canvas.c
+++ b/tools/browser/canvas/browser-canvas.c
@@ -311,8 +311,10 @@ motion_notify_event_cb (BrowserCanvas *canvas, GdkEvent *event, G_GNUC_UNUSED Go
return done;
}
+#ifdef HAVE_GRAPHVIZ
static void popup_layout_default_cb (GtkMenuItem *mitem, BrowserCanvas *canvas);
static void popup_layout_radial_cb (GtkMenuItem *mitem, BrowserCanvas *canvas);
+#endif
static void popup_zoom_in_cb (GtkMenuItem *mitem, BrowserCanvas *canvas);
static void popup_zoom_out_cb (GtkMenuItem *mitem, BrowserCanvas *canvas);
static void popup_zoom_fit_cb (GtkMenuItem *mitem, BrowserCanvas *canvas);
@@ -436,6 +438,7 @@ canvas_event_cb (BrowserCanvas *canvas, GdkEvent *event, GooCanvas *gcanvas)
return done;
}
+#ifdef HAVE_GRAPHVIZ
static void
popup_layout_default_cb (G_GNUC_UNUSED GtkMenuItem *mitem, BrowserCanvas *canvas)
{
@@ -447,6 +450,7 @@ popup_layout_radial_cb (G_GNUC_UNUSED GtkMenuItem *mitem, BrowserCanvas *canvas)
{
browser_canvas_perform_auto_layout (canvas, TRUE, BROWSER_CANVAS_LAYOUT_RADIAL);
}
+#endif
static void
popup_zoom_in_cb (G_GNUC_UNUSED GtkMenuItem *mitem, BrowserCanvas *canvas)
diff --git a/tools/browser/data-manager/data-source-manager.c b/tools/browser/data-manager/data-source-manager.c
index 7709f1d..431f771 100644
--- a/tools/browser/data-manager/data-source-manager.c
+++ b/tools/browser/data-manager/data-source-manager.c
@@ -540,7 +540,7 @@ data_source_manager_get_sources_array (DataSourceManager *mgr, G_GNUC_UNUSED GEr
if (source_depends_on (source, source2)) {
dep_found = TRUE;
/* add source to column i+1 if not yet present */
- if (i == array->len - 1) {
+ if (i == (gssize)array->len - 1) {
GArray *subarray = g_array_new (FALSE, FALSE,
sizeof (DataSource*));
g_array_append_val (array, subarray);
diff --git a/tools/browser/data-manager/data-widget.c b/tools/browser/data-manager/data-widget.c
index b0877d9..fd79b7f 100644
--- a/tools/browser/data-manager/data-widget.c
+++ b/tools/browser/data-manager/data-widget.c
@@ -740,7 +740,7 @@ source_exec_finished_cb (G_GNUC_UNUSED DataSource *source, GError *error, DataPa
#endif
/* compute part->export_data */
- formgrid_data_set_changed_cb (cwid, part);
+ formgrid_data_set_changed_cb (UI_FORMGRID (cwid), part);
}
else {
GError *lerror = NULL;
diff --git a/tools/browser/ldap-browser/mgr-ldap-entries.c b/tools/browser/ldap-browser/mgr-ldap-entries.c
index 52aa29c..5bf8fbe 100644
--- a/tools/browser/ldap-browser/mgr-ldap-entries.c
+++ b/tools/browser/ldap-browser/mgr-ldap-entries.c
@@ -220,7 +220,7 @@ mgr_ldap_entries_update_children (GdaTreeManager *manager, GdaTreeNode *node,
g_main_loop_unref (data.loop);
if (data.entries) {
- gint i;
+ guint i;
GSList *list = NULL;
GArray *sorted_array;
sorted_array = g_array_new (FALSE, FALSE, sizeof (GdaLdapEntry*));
diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c
index de5aecf..2e3aca0 100644
--- a/tools/browser/query-exec/query-editor.c
+++ b/tools/browser/query-exec/query-editor.c
@@ -534,7 +534,7 @@ event (GtkWidget *text_view, GdkEvent *ev, QueryEditor *editor)
g_free (editor->priv->current_state_text);
editor->priv->current_state_text = query_editor_get_all_text (editor);
}
- else if (editor->priv->current_state >= editor->priv->states->len)
+ else if (editor->priv->current_state >= (gint)editor->priv->states->len)
i = editor->priv->states->len - 1; /* last stored state */
else if (editor->priv->current_state > 0)
i = editor->priv->current_state - 1;
@@ -559,7 +559,7 @@ event (GtkWidget *text_view, GdkEvent *ev, QueryEditor *editor)
(evkey->keyval == GDK_KEY_Down) &&
editor->priv->states) {
if (editor->priv->states->len > 0) {
- if (editor->priv->current_state < editor->priv->states->len - 1) {
+ if (editor->priv->current_state < (gint)editor->priv->states->len - 1) {
gchar *tmp;
editor->priv->current_state ++;
tmp = g_array_index (editor->priv->states, gchar*, editor->priv->current_state);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]