libgda r3263 - in trunk: . libgda libgda-report libgda-report/DocBook libgda-report/engine libgda-xslt libgda/sql-parser libgda/sqlite libgda/sqlite/virtual providers/firebird providers/jdbc providers/mysql providers/postgres providers/skel-implementation/capi tests tests/data-models tests/multi-threading tests/value-holders tools
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: libgda r3263 - in trunk: . libgda libgda-report libgda-report/DocBook libgda-report/engine libgda-xslt libgda/sql-parser libgda/sqlite libgda/sqlite/virtual providers/firebird providers/jdbc providers/mysql providers/postgres providers/skel-implementation/capi tests tests/data-models tests/multi-threading tests/value-holders tools
- Date: Thu, 11 Dec 2008 19:58:57 +0000 (UTC)
Author: murrayc
Date: Thu Dec 11 19:58:57 2008
New Revision: 3263
URL: http://svn.gnome.org/viewvc/libgda?rev=3263&view=rev
Log:
2008-12-11 Murray Cumming <murrayc murrayc com>
* Many files: Add an extra %s arguement to g_set_error() calls,
to avoid warnings about the lack of format and arguments.
We should really use g_set_error_literal() instead but that requires
glib 2.18.
Modified:
trunk/ChangeLog
trunk/gtk-doc.make
trunk/libgda-report/DocBook/gda-report-docbook-document.c
trunk/libgda-report/engine/gda-report-engine.c
trunk/libgda-report/gda-report-document.c
trunk/libgda-xslt/sql_backend.c
trunk/libgda/gda-config.c
trunk/libgda/gda-connection.c
trunk/libgda/gda-data-access-wrapper.c
trunk/libgda/gda-data-comparator.c
trunk/libgda/gda-data-model-array.c
trunk/libgda/gda-data-model-bdb.c
trunk/libgda/gda-data-model-dir.c
trunk/libgda/gda-data-model-import.c
trunk/libgda/gda-data-model-iter.c
trunk/libgda/gda-data-model.c
trunk/libgda/gda-data-proxy.c
trunk/libgda/gda-data-select.c
trunk/libgda/gda-easy.c
trunk/libgda/gda-holder.c
trunk/libgda/gda-meta-store.c
trunk/libgda/gda-meta-struct-io.c
trunk/libgda/gda-meta-struct.c
trunk/libgda/gda-server-operation.c
trunk/libgda/gda-server-provider-extra.c
trunk/libgda/gda-set.c
trunk/libgda/gda-statement.c
trunk/libgda/gda-util.c
trunk/libgda/gda-xa-transaction.c
trunk/libgda/sql-parser/gda-sql-parser.c
trunk/libgda/sql-parser/gda-statement-struct-compound.c
trunk/libgda/sql-parser/gda-statement-struct-delete.c
trunk/libgda/sql-parser/gda-statement-struct-insert.c
trunk/libgda/sql-parser/gda-statement-struct-select.c
trunk/libgda/sql-parser/gda-statement-struct-update.c
trunk/libgda/sql-parser/gda-statement-struct.c
trunk/libgda/sqlite/gda-sqlite-ddl.c
trunk/libgda/sqlite/gda-sqlite-provider.c
trunk/libgda/sqlite/gda-sqlite-recordset.c
trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c
trunk/libgda/sqlite/virtual/gda-vconnection-hub.c
trunk/libgda/sqlite/virtual/gda-virtual-connection.c
trunk/providers/firebird/gda-firebird-ddl.c
trunk/providers/firebird/gda-firebird-provider.c
trunk/providers/jdbc/gda-jdbc-ddl.c
trunk/providers/jdbc/gda-jdbc-provider.c
trunk/providers/jdbc/gda-jdbc-util.c
trunk/providers/jdbc/jni-wrapper.c
trunk/providers/mysql/gda-mysql-ddl.c
trunk/providers/mysql/gda-mysql-meta.c
trunk/providers/mysql/gda-mysql-provider.c
trunk/providers/mysql/gda-mysql-util.c
trunk/providers/postgres/gda-postgres-ddl.c
trunk/providers/postgres/gda-postgres-meta.c
trunk/providers/postgres/gda-postgres-provider.c
trunk/providers/postgres/gda-postgres-recordset.c
trunk/providers/postgres/gda-postgres-util.c
trunk/providers/skel-implementation/capi/gda-capi-ddl.c
trunk/providers/skel-implementation/capi/gda-capi-provider.c
trunk/tests/data-models/check_data_proxy.c
trunk/tests/data-models/check_empty_rs.c
trunk/tests/data-models/check_pmodel.c
trunk/tests/gda-ddl-creator.c
trunk/tests/multi-threading/common.c
trunk/tests/test-cnc-utils.c
trunk/tests/value-holders/check_holder.c
trunk/tests/value-holders/check_set.c
trunk/tools/command-exec.c
trunk/tools/gda-sql.c
Modified: trunk/gtk-doc.make
==============================================================================
--- trunk/gtk-doc.make (original)
+++ trunk/gtk-doc.make Thu Dec 11 19:58:57 2008
@@ -7,9 +7,11 @@
if GTK_DOC_USE_LIBTOOL
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = $(LIBTOOL) --mode=execute
else
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = sh -c
endif
# We set GPATH here; this gives us semantics for GNU make
@@ -53,6 +55,8 @@
docs: html-build.stamp
+$(REPORT_FILES): sgml-build.stamp
+
#### scan ####
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@@ -61,7 +65,7 @@
cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
@@ -107,7 +111,12 @@
@-chmod -R u+w $(srcdir)
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
- cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+ fi
+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -128,24 +137,37 @@
cd $(srcdir) && rm -rf xml html
install-data-local:
- -installfiles=`echo $(srcdir)/html/*`; \
+ installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+ if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+ fi; \
+ $(mkinstalldirs) $${installdir} ; \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ $(INSTALL_DATA) $$i $${installdir}; \
done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
- which gtkdoc-rebase >/dev/null && \
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+ if test -n "$(DOC_MODULE_VERSION)"; then \
+ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
fi
-
uninstall-local:
- rm -f $(DESTDIR)$(TARGET_DIR)/*
+ if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+ fi; \
+ rm -rf $${installdir}
#
# Require gtk-doc when making dist
@@ -168,6 +190,7 @@
-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
cd $(distdir) && rm -f $(DISTCLEANFILES)
- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
Modified: trunk/libgda-report/DocBook/gda-report-docbook-document.c
==============================================================================
--- trunk/libgda-report/DocBook/gda-report-docbook-document.c (original)
+++ trunk/libgda-report/DocBook/gda-report-docbook-document.c Thu Dec 11 19:58:57 2008
@@ -295,7 +295,7 @@
fdoc->priv->html_stylesheet = NULL;
}
if (!fdoc->priv->html_stylesheet) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Could not find the DocBook XSL stylesheet for HTML"));
g_static_mutex_unlock (&init_mutex);
return FALSE;
@@ -363,7 +363,7 @@
fdoc->priv->fo_stylesheet = NULL;
}
if (!fdoc->priv->fo_stylesheet) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Could not find the DocBook XSL stylesheet for Formatting Objects"));
return FALSE;
}
Modified: trunk/libgda-report/engine/gda-report-engine.c
==============================================================================
--- trunk/libgda-report/engine/gda-report-engine.c (original)
+++ trunk/libgda-report/engine/gda-report-engine.c Thu Dec 11 19:58:57 2008
@@ -580,7 +580,7 @@
xmlFree (prop);
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No connection specified"));
return FALSE;
}
@@ -607,7 +607,7 @@
xmlFree (prop);
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No connection specified"));
return FALSE;
}
@@ -647,7 +647,7 @@
}
if (!ctx) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Query is not specified (not named and not defined)"));
return FALSE;
}
@@ -820,7 +820,7 @@
return TRUE;
}
else {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Parameter name not specified"));
return FALSE;
}
@@ -870,7 +870,7 @@
prop = xmlGetProp (node, BAD_CAST "expr");
if (!prop) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No expression specified"));
return FALSE;
}
Modified: trunk/libgda-report/gda-report-document.c
==============================================================================
--- trunk/libgda-report/gda-report-document.c (original)
+++ trunk/libgda-report/gda-report-document.c Thu Dec 11 19:58:57 2008
@@ -250,7 +250,7 @@
xmlNodePtr node, res;
xmlDocPtr res_doc;
if (!doc->priv->doc || !(node = xmlDocGetRootElement (doc->priv->doc))) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Document not specified"));
return FALSE;
}
@@ -277,7 +277,7 @@
FILE *file;
file = fdopen (fd, "w");
if (xmlDocDump (file, res_doc) < 0) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Cannot create temporary file"));
DO_UNLINK (tmp_filename);
g_free (tmp_filename);
Modified: trunk/libgda-xslt/sql_backend.c
==============================================================================
--- trunk/libgda-xslt/sql_backend.c (original)
+++ trunk/libgda-xslt/sql_backend.c Thu Dec 11 19:58:57 2008
@@ -131,7 +131,7 @@
}
if (query_node == NULL) {
g_set_error (&(exec->error), 0, 0,
- "no query node in section node");
+ "%s", "no query node in section node");
return -1;
}
/* set the query context */
@@ -396,7 +396,7 @@
#ifdef GDA_DEBUG_NO
g_print ("xmlNewNode return NULL\n");
#endif
- g_set_error (error, 0, 0, "xmlNewNode return NULL\n");
+ g_set_error (error, 0, 0, "%s", "xmlNewNode return NULL\n");
return -1;
}
/* compute columns */
@@ -503,7 +503,7 @@
query_name = xmlGetProp (query_node, (const xmlChar *) "name");
if (query_name == NULL) {
g_set_error (&(exec->error), 0, 0,
- "the query element is not correct, no 'name' attribute\n");
+ "%s", "the query element is not correct, no 'name' attribute\n");
return -1;
}
@@ -514,7 +514,7 @@
sqltxt_node = query_node->children;
if (sqltxt_node == NULL || sqltxt_node->type != XML_TEXT_NODE) {
g_set_error (&(exec->error), 0, 0,
- "the query element is not correct, it have not a first text children\n");
+ "%s", "the query element is not correct, it have not a first text children\n");
return -1;
}
#ifdef GDA_DEBUG_NO
Modified: trunk/libgda/gda-config.c
==============================================================================
--- trunk/libgda/gda-config.c (original)
+++ trunk/libgda/gda-config.c Thu Dec 11 19:58:57 2008
@@ -765,7 +765,7 @@
if (info->is_system && !unique_instance->priv->system_config_allowed) {
g_set_error (error, GDA_CONFIG_ERROR, GDA_CONFIG_PERMISSION_ERROR,
- _("Can't manage system-wide configuration"));
+ "%s", _("Can't manage system-wide configuration"));
GDA_CONFIG_UNLOCK ();
return FALSE;
}
@@ -854,7 +854,7 @@
}
if (info->is_system && !unique_instance->priv->system_config_allowed) {
g_set_error (error, GDA_CONFIG_ERROR, GDA_CONFIG_PERMISSION_ERROR,
- _("Can't manage system-wide configuration"));
+ "%s", _("Can't manage system-wide configuration"));
GDA_CONFIG_UNLOCK ();
return FALSE;
}
Modified: trunk/libgda/gda-connection.c
==============================================================================
--- trunk/libgda/gda-connection.c (original)
+++ trunk/libgda/gda-connection.c Thu Dec 11 19:58:57 2008
@@ -628,7 +628,7 @@
}
else
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR,
- _("Datasource configuration error: no provider specified"));
+ "%s", _("Datasource configuration error: no provider specified"));
g_free (real_auth_string);
g_free (real_dsn);
@@ -703,7 +703,7 @@
if (!provider_name && !real_provider) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR,
- _("No provider specified"));
+ "%s", _("No provider specified"));
g_free (user);
g_free (pass);
g_free (real_cnc);
@@ -807,7 +807,7 @@
if (!cnc->priv->cnc_string) {
gda_log_error (_("No DSN or connection string specified"));
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_NO_CNC_SPEC_ERROR,
- _("No DSN or connection string specified"));
+ "%s", _("No DSN or connection string specified"));
gda_connection_unlock ((GdaLockable*) cnc);
return FALSE;
}
@@ -817,7 +817,7 @@
/* provider test */
if (!cnc->priv->provider_obj) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR,
- _("No provider specified"));
+ "%s", _("No provider specified"));
gda_connection_unlock ((GdaLockable*) cnc);
return FALSE;
}
@@ -825,14 +825,14 @@
if (PROV_CLASS (cnc->priv->provider_obj)->limiting_thread &&
(PROV_CLASS (cnc->priv->provider_obj)->limiting_thread != g_thread_self ())) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_PROVIDER_ERROR,
- _("Provider does not allow usage from this thread"));
+ "%s", _("Provider does not allow usage from this thread"));
gda_connection_unlock ((GdaLockable*) cnc);
return FALSE;
}
if (!PROV_CLASS (cnc->priv->provider_obj)->open_connection) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_PROVIDER_ERROR,
- _("Internal error: provider does not implement the open_connection() virtual method"));
+ "%s", _("Internal error: provider does not implement the open_connection() virtual method"));
gda_connection_unlock ((GdaLockable*) cnc);
return FALSE;
}
@@ -1444,7 +1444,7 @@
cnc, stmt, error);
else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support statement preparation"));
+ "%s", _("Provider does not support statement preparation"));
return FALSE;
}
}
@@ -1612,7 +1612,7 @@
if ((gda_statement_get_statement_type (stmt) == GDA_SQL_STATEMENT_SELECT) ||
(gda_statement_get_statement_type (stmt) == GDA_SQL_STATEMENT_COMPOUND)) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_STATEMENT_TYPE_ERROR,
- _("Statement is a selection statement"));
+ "%s", _("Statement is a selection statement"));
return -1;
}
@@ -1627,7 +1627,7 @@
if (!GDA_IS_SET (set)) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_STATEMENT_TYPE_ERROR,
- _("Statement is a selection statement"));
+ "%s", _("Statement is a selection statement"));
g_object_unref (set);
return -1;
}
@@ -1686,7 +1686,7 @@
error, -1);
if (model && !GDA_IS_DATA_MODEL (model)) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_STATEMENT_TYPE_ERROR,
- _("Statement is not a selection statement"));
+ "%s", _("Statement is not a selection statement"));
g_object_unref (model);
model = NULL;
}
@@ -1747,7 +1747,7 @@
g_free (types);
if (model && !GDA_IS_DATA_MODEL (model)) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_STATEMENT_TYPE_ERROR,
- _("Statement is not a selection statement"));
+ "%s", _("Statement is not a selection statement"));
g_object_unref (model);
model = NULL;
}
@@ -1802,7 +1802,7 @@
gda_connection_unlock ((GdaLockable*) cnc);
if (model && !GDA_IS_DATA_MODEL (model)) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_STATEMENT_TYPE_ERROR,
- _("Statement is not a selection statement"));
+ "%s", _("Statement is not a selection statement"));
g_object_unref (model);
model = NULL;
}
@@ -2148,7 +2148,7 @@
for (j = 0; j < nb_params; j++) {
GValue *v = *(spec_array[j].pvalue);
if (v && (gda_value_is_null (v) || (G_VALUE_TYPE (v) != spec_array[j].type))) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Invalid argument"));
retval = -1;
}
@@ -2866,7 +2866,7 @@
data->error = lerror;
else {
g_set_error (&lerror, 0, 0,
- _("Meta update error"));
+ "%s", _("Meta update error"));
data->error = lerror;
}
@@ -3334,7 +3334,7 @@
g_free (key.filters);
if (!stmt) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
- _("Wrong filter arguments"));
+ "%s", _("Wrong filter arguments"));
if (set)
g_object_unref (set);
return NULL;
Modified: trunk/libgda/gda-data-access-wrapper.c
==============================================================================
--- trunk/libgda/gda-data-access-wrapper.c (original)
+++ trunk/libgda/gda-data-access-wrapper.c Thu Dec 11 19:58:57 2008
@@ -492,7 +492,7 @@
}
else {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Can't set iterator's position"));
+ "%s", _("Can't set iterator's position"));
return NULL;
}
}
@@ -520,7 +520,7 @@
}
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Can't access data"));
+ "%s", _("Can't access data"));
return NULL;
}
Modified: trunk/libgda/gda-data-comparator.c
==============================================================================
--- trunk/libgda/gda-data-comparator.c (original)
+++ trunk/libgda/gda-data-comparator.c Thu Dec 11 19:58:57 2008
@@ -438,18 +438,18 @@
/* check setup */
if (!comp->priv->old_model) {
g_set_error (error, GDA_DATA_COMPARATOR_ERROR, GDA_DATA_COMPARATOR_MISSING_DATA_MODEL_ERROR,
- _("Missing original data model"));
+ "%s", _("Missing original data model"));
return FALSE;
}
if (!comp->priv->new_model) {
g_set_error (error, GDA_DATA_COMPARATOR_ERROR, GDA_DATA_COMPARATOR_MISSING_DATA_MODEL_ERROR,
- _("Missing new data model"));
+ "%s", _("Missing new data model"));
return FALSE;
}
if (! (gda_data_model_get_access_flags (comp->priv->old_model) & GDA_DATA_MODEL_ACCESS_RANDOM) ||
! (gda_data_model_get_access_flags (comp->priv->new_model) & GDA_DATA_MODEL_ACCESS_RANDOM)) {
g_set_error (error, GDA_DATA_COMPARATOR_ERROR, GDA_DATA_COMPARATOR_MODEL_ACCESS_ERROR,
- _("Data models must support random access model"));
+ "%s", _("Data models must support random access model"));
return FALSE;
}
@@ -458,7 +458,7 @@
nncols = gda_data_model_get_n_columns (comp->priv->new_model);
if (oncols != nncols) {
g_set_error (error, GDA_DATA_COMPARATOR_ERROR, GDA_DATA_COMPARATOR_MISSING_DATA_MODEL_ERROR,
- _("Data models to compare don't have the same number of columns"));
+ "%s", _("Data models to compare don't have the same number of columns"));
return FALSE;
}
@@ -558,7 +558,7 @@
if (stop) {
g_set_error (error, GDA_DATA_COMPARATOR_ERROR,
GDA_DATA_COMPARATOR_USER_CANCELLED_ERROR,
- _("Differences computation cancelled on signal handling"));
+ "%s", _("Differences computation cancelled on signal handling"));
g_free (rows_to_del);
return FALSE;
}
@@ -594,7 +594,7 @@
if (stop) {
g_set_error (error, GDA_DATA_COMPARATOR_ERROR,
GDA_DATA_COMPARATOR_USER_CANCELLED_ERROR,
- _("Differences computation cancelled on signal handling"));
+ "%s", _("Differences computation cancelled on signal handling"));
g_free (rows_to_del);
return FALSE;
}
Modified: trunk/libgda/gda-data-model-array.c
==============================================================================
--- trunk/libgda/gda-data-model-array.c (original)
+++ trunk/libgda/gda-data-model-array.c Thu Dec 11 19:58:57 2008
@@ -521,7 +521,7 @@
if (amodel->priv->rows->len == 0) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,
- _("No row in data model"));
+ "%s", _("No row in data model"));
return NULL;
}
@@ -546,7 +546,7 @@
}
else {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,
- _("Data model has no data"));
+ "%s", _("Data model has no data"));
return NULL;
}
}
@@ -601,7 +601,7 @@
if (amodel->priv->read_only) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Attempting to modify a read-only data model"));
+ "%s", _("Attempting to modify a read-only data model"));
return FALSE;
}
@@ -641,13 +641,13 @@
if (amodel->priv->read_only) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Attempting to modify a read-only data model"));
+ "%s", _("Attempting to modify a read-only data model"));
return FALSE;
}
if (g_list_length (values) > gda_data_model_get_n_columns (model)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_VALUES_LIST_ERROR,
- _("Too many values in list"));
+ "%s", _("Too many values in list"));
return FALSE;
}
@@ -680,13 +680,13 @@
if (amodel->priv->read_only) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Attempting to modify a read-only data model"));
+ "%s", _("Attempting to modify a read-only data model"));
return FALSE;
}
if (g_list_length ((GList *) values) > amodel->priv->number_of_columns) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_VALUES_LIST_ERROR,
- _("Too many values in list"));
+ "%s", _("Too many values in list"));
return FALSE;
}
@@ -715,7 +715,7 @@
if (amodel->priv->read_only) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Attempting to modify a read-only data model"));
+ "%s", _("Attempting to modify a read-only data model"));
return FALSE;
}
@@ -740,7 +740,7 @@
}
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,
- _("Row not found in data model"));
+ "%s", _("Row not found in data model"));
return FALSE;
}
Modified: trunk/libgda/gda-data-model-bdb.c
==============================================================================
--- trunk/libgda/gda-data-model-bdb.c (original)
+++ trunk/libgda/gda-data-model-bdb.c Thu Dec 11 19:58:57 2008
@@ -213,7 +213,7 @@
{
GError *error = NULL;
- g_set_error (&error, 0, 0, err);
+ g_set_error (&error, 0, 0, "%s", err);
model->priv->errors = g_slist_append (model->priv->errors, error);
}
@@ -609,7 +609,7 @@
tmp = g_strdup_printf (_("Column %d out of range (0-%d)"), col, imodel->priv->n_columns - 1);
add_error (imodel, tmp);
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR,
- tmp);
+ "%s", tmp);
g_free (tmp);
return NULL;
}
@@ -623,7 +623,7 @@
if (ret) {
add_error (imodel, db_strerror (ret));
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- db_strerror (ret));
+ "%s", db_strerror (ret));
return NULL;
}
@@ -742,7 +742,7 @@
tmp = g_strdup_printf (_("Column %d out of range (0-%d)"), col, imodel->priv->n_columns - 1);
add_error (imodel, tmp);
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR,
- tmp);
+ "%s", tmp);
g_free (tmp);
return FALSE;
}
@@ -844,7 +844,7 @@
if (ret) {
add_error (imodel, db_strerror (ret));
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- db_strerror (ret));
+ "%s", db_strerror (ret));
return FALSE;
}
@@ -854,7 +854,7 @@
if (key_modified) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
- _("Key modification is not supported"));
+ "%s", _("Key modification is not supported"));
return FALSE;
}
@@ -907,7 +907,7 @@
if (ret) {
add_error (imodel, db_strerror (ret));
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- db_strerror (ret));
+ "%s", db_strerror (ret));
return FALSE;
}
}
@@ -950,7 +950,7 @@
if (ret) {
add_error (imodel, db_strerror (ret));
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- db_strerror (ret));
+ "%s", db_strerror (ret));
return -1;
}
@@ -977,7 +977,7 @@
if (ret) {
add_error (imodel, db_strerror (ret));
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- db_strerror (ret));
+ "%s", db_strerror (ret));
return FALSE;
}
Modified: trunk/libgda/gda-data-model-dir.c
==============================================================================
--- trunk/libgda/gda-data-model-dir.c (original)
+++ trunk/libgda/gda-data-model-dir.c Thu Dec 11 19:58:57 2008
@@ -254,7 +254,7 @@
{
GError *error = NULL;
- g_set_error (&error, 0, 0, err);
+ g_set_error (&error, 0, 0, "%s", err);
model->priv->errors = g_slist_append (model->priv->errors, error);
}
@@ -792,7 +792,7 @@
tmp = g_strdup_printf (_("Column %d out of range (0-%d)"), col, COL_LAST-1);
add_error (imodel, tmp);
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR,
- tmp);
+ "%s", tmp);
g_free (tmp);
return NULL;
}
@@ -803,7 +803,7 @@
imodel->priv->rows->len - 1);
add_error (imodel, str);
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR,
- str);
+ "%s", str);
g_free (str);
return NULL;
}
@@ -869,7 +869,7 @@
}
else
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,
- _("Row not found"));
+ "%s", _("Row not found"));
return value;
}
@@ -929,7 +929,7 @@
gchar *tmp;
tmp = g_strdup_printf (_("Column %d out of range (0-%d)"), col, COL_LAST-1);
add_error (imodel, tmp);
- g_set_error (error, 0, 0, tmp);
+ g_set_error (error, 0, 0, "%s", tmp);
g_free (tmp);
return FALSE;
}
@@ -971,7 +971,7 @@
str = g_strdup_printf (_("Row %d out of range (0-%d)"), row,
imodel->priv->rows->len - 1);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
return FALSE;
}
@@ -992,7 +992,7 @@
case COL_MD5SUM:
default:
add_error (imodel, _("Column cannot be modified"));
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Column cannot be modified"));
return FALSE;
case COL_DIRNAME: {
@@ -1007,7 +1007,7 @@
if ((len < base_len) ||
(strncmp (new_path, imodel->priv->basedir, base_len))) {
add_error (imodel, _("New path must be a subpath of the base directory"));
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("New path must be a subpath of the base directory"));
return FALSE;
}
@@ -1051,7 +1051,7 @@
str = g_strdup_printf (_("Could not rename file '%s' to '%s'"),
filename, new_filename);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
g_free (new_filename);
g_free (filename);
@@ -1074,7 +1074,7 @@
gchar *str;
str = g_strdup_printf (_("Could not create directory '%s'"), new_path);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
g_free (old_path);
return FALSE;
@@ -1094,7 +1094,7 @@
gchar *str;
str = g_strdup_printf (_("Could not rename file '%s' to '%s'"), filename, new_filename);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
g_free (new_filename);
g_free (filename);
@@ -1143,7 +1143,7 @@
gchar *str;
str = g_strdup_printf (_("Could not overwrite contents of file '%s'"), filename);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
g_object_unref (op);
g_free (filename);
@@ -1160,7 +1160,7 @@
}
else {
add_error (imodel, _("Wrong type of data"));
- g_set_error (error, 0, 0, _("Wrong type of data"));
+ g_set_error (error, 0, 0, "%s", _("Wrong type of data"));
return FALSE;
}
break;
@@ -1202,7 +1202,7 @@
case COL_MD5SUM:
default:
add_error (imodel, _("Column cannot be set"));
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Column cannot be set"));
return -1;
case COL_DIRNAME:
@@ -1214,7 +1214,7 @@
if ((len < base_len) ||
(strncmp (dirname, imodel->priv->basedir, base_len))) {
add_error (imodel, _("New path must be a subpath of the base directory"));
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("New path must be a subpath of the base directory"));
return -1;
}
@@ -1276,7 +1276,7 @@
gchar *str;
str = g_strdup_printf (_("Cannot set contents of filename '%s'"), complete_filename);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
if (bin_to_free)
g_free (bin_data);
@@ -1287,14 +1287,14 @@
gchar *str;
str = g_strdup_printf (_("Cannot create directory '%s'"), dirname);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
return -1;
}
}
else {
add_error (imodel, _("Cannot add row: filename missing"));
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Cannot add row: filename missing"));
return -1;
}
@@ -1318,7 +1318,7 @@
str = g_strdup_printf (_("Row %d out of range (0-%d)"), row,
imodel->priv->rows->len - 1);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
return FALSE;
}
@@ -1334,7 +1334,7 @@
gchar *str;
str = g_strdup_printf (_("Cannot remove file '%s'"), filename);
add_error (imodel, str);
- g_set_error (error, 0, 0, str);
+ g_set_error (error, 0, 0, "%s", str);
g_free (str);
g_free (filename);
return FALSE;
Modified: trunk/libgda/gda-data-model-import.c
==============================================================================
--- trunk/libgda/gda-data-model-import.c (original)
+++ trunk/libgda/gda-data-model-import.c Thu Dec 11 19:58:57 2008
@@ -1581,7 +1581,7 @@
{
GError *error = NULL;
- g_set_error (&error, 0, 0, err);
+ g_set_error (&error, 0, 0, "%s", err);
model->priv->errors = g_slist_append (model->priv->errors, error);
}
@@ -1705,7 +1705,7 @@
else {
/* otherwise, bail out */
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does not support random access"));
+ "%s", _("Data model does not support random access"));
return NULL;
}
}
Modified: trunk/libgda/gda-data-model-iter.c
==============================================================================
--- trunk/libgda/gda-data-model-iter.c (original)
+++ trunk/libgda/gda-data-model-iter.c Thu Dec 11 19:58:57 2008
@@ -277,14 +277,14 @@
((GdaDataModel *) iter->priv->data_model, iter, col, new_value, &error)) {
if (!error)
g_set_error (&error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("GdaDataModel refused value change"));
+ "%s", _("GdaDataModel refused value change"));
}
}
else if (! gda_data_model_set_value_at ((GdaDataModel *) iter->priv->data_model,
col, iter->priv->row, new_value, &error)) {
if (!error)
g_set_error (&error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("GdaDataModel refused value change"));
+ "%s", _("GdaDataModel refused value change"));
}
g_signal_handler_unblock (iter->priv->data_model, iter->priv->model_changes_signals [0]);
Modified: trunk/libgda/gda-data-model.c
==============================================================================
--- trunk/libgda/gda-data-model.c (original)
+++ trunk/libgda/gda-data-model.c Thu Dec 11 19:58:57 2008
@@ -568,7 +568,7 @@
else {
/* method not supported */
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
- _("Data model does not support getting individual value"));
+ "%s", _("Data model does not support getting individual value"));
return NULL;
}
}
@@ -610,7 +610,7 @@
cvalue = NULL;
if (G_VALUE_TYPE (cvalue) != GDA_TYPE_NULL)
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_VALUE_TYPE_ERROR,
- _("Data model returned invalid NULL value"));
+ "%s", _("Data model returned invalid NULL value"));
else
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_VALUE_TYPE_ERROR,
_("Data model returned value of invalid '%s' type"),
@@ -666,7 +666,7 @@
else {
/* method not supported */
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
- _("Data model does not support setting individual value"));
+ "%s", _("Data model does not support setting individual value"));
return FALSE;
}
}
@@ -696,7 +696,7 @@
else {
/* method not supported */
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
- _("Data model does not support setting values"));
+ "%s", _("Data model does not support setting values"));
return FALSE;
}
}
@@ -750,7 +750,7 @@
else {
/* method not supported */
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
- _("Data model does not support row append"));
+ "%s", _("Data model does not support row append"));
return -1;
}
}
@@ -772,7 +772,7 @@
if (! (gda_data_model_get_access_flags (model) & GDA_DATA_MODEL_ACCESS_INSERT)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Model does not allow row insertion"));
+ "%s", _("Model does not allow row insertion"));
return -1;
}
@@ -781,7 +781,7 @@
else {
/* method not supported */
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
- _("Data model does not support row append"));
+ "%s", _("Data model does not support row append"));
return -1;
}
}
@@ -804,7 +804,7 @@
if (! (gda_data_model_get_access_flags (model) & GDA_DATA_MODEL_ACCESS_DELETE)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Model does not allow row deletion"));
+ "%s", _("Model does not allow row deletion"));
return FALSE;
}
@@ -813,7 +813,7 @@
else {
/* method not supported */
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
- _("Data model does not support row removal"));
+ "%s", _("Data model does not support row removal"));
return FALSE;
}
}
@@ -1369,7 +1369,7 @@
if ((gdatype == G_TYPE_INVALID) ||
(gdatype == GDA_TYPE_NULL)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_XML_FORMAT_ERROR,
- _("Cannot retrieve column data type (type is UNKNOWN or not specified)"));
+ "%s", _("Cannot retrieve column data type (type is UNKNOWN or not specified)"));
retval = FALSE;
break;
}
@@ -1511,7 +1511,7 @@
from_iter = gda_data_model_create_iter (from);
if (!from_iter) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Could not get an iterator for source data model"));
+ "%s", _("Could not get an iterator for source data model"));
return FALSE;
}
@@ -2085,7 +2085,7 @@
else {
if (! (gda_data_model_get_access_flags (model) & GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does not support backward cursor move, not displaying data"));
+ "%s", _("Data model does not support backward cursor move, not displaying data"));
allok = FALSE;
}
ramodel = gda_data_access_wrapper_new (model);
Modified: trunk/libgda/gda-data-proxy.c
==============================================================================
--- trunk/libgda/gda-data-proxy.c (original)
+++ trunk/libgda/gda-data-proxy.c Thu Dec 11 19:58:57 2008
@@ -2777,7 +2777,7 @@
if (lerror)
g_error_free (lerror);
g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_FILTER_ERROR,
- _("Could not create virtual connection"));
+ "%s", _("Could not create virtual connection"));
proxy->priv->force_direct_mapping = FALSE;
goto clean_previous_filter;
}
@@ -2818,7 +2818,7 @@
filtered_rows = gda_connection_statement_execute_select (vcnc, stmt, NULL, NULL);
if (!filtered_rows) {
g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_FILTER_ERROR,
- _("Error in filter expression"));
+ "%s", _("Error in filter expression"));
proxy->priv->force_direct_mapping = FALSE;
gda_vconnection_data_model_remove (GDA_VCONNECTION_DATA_MODEL (vcnc), "proxy", NULL);
goto clean_previous_filter;
@@ -2831,7 +2831,7 @@
gda_vconnection_data_model_remove (GDA_VCONNECTION_DATA_MODEL (vcnc), "proxy", NULL);
if (!copy) {
g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_FILTER_ERROR,
- _("Error in filter expression"));
+ "%s", _("Error in filter expression"));
proxy->priv->force_direct_mapping = FALSE;
filtered_rows = NULL;
goto clean_previous_filter;
@@ -2941,7 +2941,7 @@
if (ptr || !stmt || (gda_statement_get_statement_type (stmt) != GDA_SQL_STATEMENT_SELECT)) {
/* also catches problems with multiple statements in @filter_expr, such as SQL code injection */
g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_FILTER_ERROR,
- _("Incorrect filter expression"));
+ "%s", _("Incorrect filter expression"));
if (stmt)
g_object_unref (stmt);
proxy->priv->force_direct_mapping = FALSE;
@@ -3425,7 +3425,7 @@
if ((proxy_row == 0) && proxy->priv->add_null_entry) {
g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_READ_ONLY_ROW,
- _("The first row is an empty row artificially prepended and cannot be altered"));
+ "%s", _("The first row is an empty row artificially prepended and cannot be altered"));
return FALSE;
}
@@ -3642,7 +3642,7 @@
if (proxy->priv->add_null_entry && row == 0) {
g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_READ_ONLY_ROW,
- _("The first row is an empty row artificially prepended and cannot be removed"));
+ "%s", _("The first row is an empty row artificially prepended and cannot be removed"));
return FALSE;
}
Modified: trunk/libgda/gda-data-select.c
==============================================================================
--- trunk/libgda/gda-data-select.c (original)
+++ trunk/libgda/gda-data-select.c Thu Dec 11 19:58:57 2008
@@ -941,7 +941,7 @@
if (remain) {
g_object_unref (stmt);
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SQL_ERROR,
- _("Incorrect SQL expression"));
+ "%s", _("Incorrect SQL expression"));
return FALSE;
}
@@ -966,20 +966,20 @@
if (! model->prep_stmt) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Internal error: the \"prepared-stmt\" property has not been set"));
+ "%s", _("Internal error: the \"prepared-stmt\" property has not been set"));
return NULL;
}
sel_stmt = gda_pstmt_get_gda_statement (model->prep_stmt);
if (! sel_stmt) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Can't get the prepared statement's actual statement"));
+ "%s", _("Can't get the prepared statement's actual statement"));
return NULL;
}
if (gda_statement_get_statement_type (sel_stmt) != GDA_SQL_STATEMENT_SELECT) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Unsupported type of SELECT statement"));
+ "%s", _("Unsupported type of SELECT statement"));
return NULL;
}
@@ -1048,13 +1048,13 @@
ins = (GdaSqlStatementInsert*) sqlst->contents;
if (!ins->values_list || ! ins->values_list->data) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("INSERT statement must contain values to insert"));
+ "%s", _("INSERT statement must contain values to insert"));
gda_sql_statement_free (sqlst);
return FALSE;
}
if (ins->values_list->next) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("INSERT statement must insert only one row"));
+ "%s", _("INSERT statement must insert only one row"));
gda_sql_statement_free (sqlst);
return FALSE;
}
@@ -1081,7 +1081,7 @@
}
else {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("DELETE statement must have a WHERE part"));
+ "%s", _("DELETE statement must have a WHERE part"));
gda_sql_statement_free (sqlst);
return FALSE;
}
@@ -1121,7 +1121,7 @@
}
else {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("UPDATE statement must have a WHERE part"));
+ "%s", _("UPDATE statement must have a WHERE part"));
gda_sql_statement_free (sqlst);
return FALSE;
}
@@ -1205,7 +1205,7 @@
}
else {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Modification statement must be an INSERT, UPDATE or DELETE statement"));
+ "%s", _("Modification statement must be an INSERT, UPDATE or DELETE statement"));
return FALSE;
}
@@ -1251,7 +1251,7 @@
if (!model->priv->cnc) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_CONNECTION_ERROR,
- _("No connection to use"));
+ "%s", _("No connection to use"));
return FALSE;
}
for (mtype = FIRST_QUERY; mtype < NB_QUERIES; mtype++)
@@ -1297,7 +1297,7 @@
GdaSqlOperation *op = (GdaSqlOperation*) part;
if (op->operator_type != GDA_SQL_OPERATOR_TYPE_EQ) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Invalid unique row condition (ony equal operators are allowed)"));
+ "%s", _("Invalid unique row condition (ony equal operators are allowed)"));
return FALSE;
}
@@ -1329,7 +1329,7 @@
if (model->priv->modif_internals->unique_row_condition) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Unique row condition has already been specified"));
+ "%s", _("Unique row condition has already been specified"));
return FALSE;
}
@@ -1384,7 +1384,7 @@
if (model->priv->modif_internals->unique_row_condition) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Unique row condition has already been specified"));
+ "%s", _("Unique row condition has already been specified"));
return FALSE;
}
@@ -1402,7 +1402,7 @@
if (remain) {
g_object_unref (stmt);
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SQL_ERROR,
- _("Incorrect filter expression"));
+ "%s", _("Incorrect filter expression"));
g_free (sql);
return FALSE;
}
@@ -1457,7 +1457,7 @@
if (!model->priv->cnc) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_CONNECTION_ERROR,
- _("No connection to use"));
+ "%s", _("No connection to use"));
return FALSE;
}
@@ -1466,18 +1466,18 @@
select = (GdaSqlStatementSelect*) sqlst->contents;
if (!select->from || ! select->from->targets || ! select->from->targets->data) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SQL_ERROR,
- _("No table to select from in SELECT statement"));
+ "%s", _("No table to select from in SELECT statement"));
goto out;
}
if (select->from->targets->next) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SQL_ERROR,
- _("SELECT statement uses more than one table to select from"));
+ "%s", _("SELECT statement uses more than one table to select from"));
goto out;
}
target = (GdaSqlSelectTarget *) select->from->targets->data;
if (!target->table_name) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SQL_ERROR,
- _("No table to select from in SELECT statement"));
+ "%s", _("No table to select from in SELECT statement"));
goto out;
}
g_value_set_string ((nvalue = gda_value_new (G_TYPE_STRING)), target->table_name);
@@ -1642,7 +1642,7 @@
/* available only if GDA_DATA_MODEL_ACCESS_RANDOM */
if (! (imodel->priv->usage_flags & GDA_DATA_MODEL_ACCESS_RANDOM)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does only support random access"));
+ "%s", _("Data model does only support random access"));
return NULL;
}
@@ -1671,7 +1671,7 @@
GdaDataModel *tmpmodel;
if (!dstmt->select || !dstmt->params) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Unable to retreive data after modifications, no further modification will be allowed"));
+ "%s", _("Unable to retreive data after modifications, no further modification will be allowed"));
imodel->priv->modif_internals->safely_locked = TRUE;
return NULL;
}
@@ -1680,7 +1680,7 @@
dstmt->params, NULL);
if (!tmpmodel) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Unable to retreive data after modifications, no further modification will be allowed"));
+ "%s", _("Unable to retreive data after modifications, no further modification will be allowed"));
imodel->priv->modif_internals->safely_locked = TRUE;
return NULL;
}
@@ -1688,7 +1688,7 @@
if (gda_data_model_get_n_rows (tmpmodel) != 1) {
g_object_unref (tmpmodel);
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Unable to retreive data after modifications, no further modification will be allowed"));
+ "%s", _("Unable to retreive data after modifications, no further modification will be allowed"));
imodel->priv->modif_internals->safely_locked = TRUE;
return NULL;
}
@@ -1710,7 +1710,7 @@
g_object_unref (tmpmodel);
g_object_unref (prow);
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Unable to retreive data after modifications, no further modification will be allowed"));
+ "%s", _("Unable to retreive data after modifications, no further modification will be allowed"));
imodel->priv->modif_internals->safely_locked = TRUE;
return NULL;
}
@@ -2054,7 +2054,7 @@
updstmt = (GdaStatement *) g_object_new (GDA_TYPE_STATEMENT, "structure", sqlst, NULL);
else
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("Some columns can't be modified"));
+ "%s", _("Some columns can't be modified"));
gda_sql_statement_free (sqlst);
#ifdef GDA_DEBUG_NO
@@ -2147,7 +2147,7 @@
insstmt = (GdaStatement *) g_object_new (GDA_TYPE_STATEMENT, "structure", sqlst, NULL);
else
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("Some columns can't be modified"));
+ "%s", _("Some columns can't be modified"));
gda_sql_statement_free (sqlst);
#ifdef GDA_DEBUG_NO
@@ -2201,7 +2201,7 @@
sel_stmt = model->priv->sel_stmt;
if (! sel_stmt) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Internal error: can't get the prepared statement's actual statement"));
+ "%s", _("Internal error: can't get the prepared statement's actual statement"));
return NULL;
}
@@ -2241,14 +2241,14 @@
}
if (!row_cond) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Unable to identify a way to fetch a single row"));
+ "%s", _("Unable to identify a way to fetch a single row"));
return NULL;
}
g_object_get (G_OBJECT (sel_stmt), "structure", &sel_sqlst, NULL);
if (sel_sqlst->stmt_type != GDA_SQL_STATEMENT_SELECT) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Can only operate on non compound SELECT statements"));
+ "%s", _("Can only operate on non compound SELECT statements"));
gda_sql_statement_free (sel_sqlst);
gda_sql_expr_free (row_cond);
return NULL;
@@ -2329,17 +2329,17 @@
if (imodel->priv->modif_internals->safely_locked) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SAFETY_LOCKED_ERROR,
- _("Modifications are not allowed anymore"));
+ "%s", _("Modifications are not allowed anymore"));
return FALSE;
}
if (!iter && ! (imodel->priv->usage_flags & GDA_DATA_MODEL_ACCESS_RANDOM)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does only support random access"));
+ "%s", _("Data model does only support random access"));
return FALSE;
}
if (! imodel->priv->modif_internals->modif_stmts [UPD_QUERY]) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("No UPDATE statement provided"));
+ "%s", _("No UPDATE statement provided"));
return FALSE;
}
@@ -2379,7 +2379,7 @@
cvalue = gda_data_model_iter_get_value_at (iter, i);
if (!cvalue) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Could not get iterator's value"));
+ "%s", _("Could not get iterator's value"));
return FALSE;
}
}
@@ -2496,17 +2496,17 @@
if (imodel->priv->modif_internals->safely_locked) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SAFETY_LOCKED_ERROR,
- _("Modifications are not allowed anymore"));
+ "%s", _("Modifications are not allowed anymore"));
return FALSE;
}
if (! (imodel->priv->usage_flags & GDA_DATA_MODEL_ACCESS_RANDOM)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does only support random access"));
+ "%s", _("Data model does only support random access"));
return FALSE;
}
if (! imodel->priv->modif_internals->modif_stmts [UPD_QUERY]) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("No UPDATE statement provided"));
+ "%s", _("No UPDATE statement provided"));
return FALSE;
}
@@ -2562,12 +2562,12 @@
if (imodel->priv->modif_internals->safely_locked) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SAFETY_LOCKED_ERROR,
- _("Modifications are not allowed anymore"));
+ "%s", _("Modifications are not allowed anymore"));
return FALSE;
}
if (! imodel->priv->modif_internals->modif_stmts [UPD_QUERY]) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("No UPDATE statement provided"));
+ "%s", _("No UPDATE statement provided"));
return FALSE;
}
@@ -2637,17 +2637,17 @@
if (imodel->priv->modif_internals->safely_locked) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SAFETY_LOCKED_ERROR,
- _("Modifications are not allowed anymore"));
+ "%s", _("Modifications are not allowed anymore"));
return FALSE;
}
if (! (imodel->priv->usage_flags & GDA_DATA_MODEL_ACCESS_RANDOM)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does only support random access"));
+ "%s", _("Data model does only support random access"));
return FALSE;
}
if (! imodel->priv->modif_internals->modif_stmts [UPD_QUERY]) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("No UPDATE statement provided"));
+ "%s", _("No UPDATE statement provided"));
return FALSE;
}
@@ -2724,22 +2724,22 @@
if (imodel->priv->modif_internals->safely_locked) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SAFETY_LOCKED_ERROR,
- _("Modifications are not allowed anymore"));
+ "%s", _("Modifications are not allowed anymore"));
return -1;
}
if (! (imodel->priv->usage_flags & GDA_DATA_MODEL_ACCESS_RANDOM)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does only support random access"));
+ "%s", _("Data model does only support random access"));
return -1;
}
if (! imodel->priv->modif_internals->modif_stmts [INS_QUERY]) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("No INSERT statement provided"));
+ "%s", _("No INSERT statement provided"));
return -1;
}
if (gda_data_select_get_n_rows (model) < 0) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_ACCESS_ERROR,
- _("Cannot add a row because the number of rows in unknown"));
+ "%s", _("Cannot add a row because the number of rows in unknown"));
return -1;
}
@@ -2766,7 +2766,7 @@
/* no actual modification to do */
bvector_free (bv);
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
- _("Missing values to insert in INSERT statement"));
+ "%s", _("Missing values to insert in INSERT statement"));
return -1;
}
@@ -2915,17 +2915,17 @@
if (imodel->priv->modif_internals->safely_locked) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_SAFETY_LOCKED_ERROR,
- _("Modifications are not allowed anymore"));
+ "%s", _("Modifications are not allowed anymore"));
return FALSE;
}
if (! (imodel->priv->usage_flags & GDA_DATA_MODEL_ACCESS_RANDOM)) {
g_set_error (error, GDA_DATA_MODEL_ERROR, GDA_DATA_MODEL_ACCESS_ERROR,
- _("Data model does only support random access"));
+ "%s", _("Data model does only support random access"));
return FALSE;
}
if (! imodel->priv->modif_internals->modif_stmts [DEL_QUERY]) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
- _("No DELETE statement provided"));
+ "%s", _("No DELETE statement provided"));
return FALSE;
}
@@ -3212,7 +3212,7 @@
if (!model->priv->cnc) {
g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_CONNECTION_ERROR,
- _("No connection to use"));
+ "%s", _("No connection to use"));
return FALSE;
}
Modified: trunk/libgda/gda-easy.c
==============================================================================
--- trunk/libgda/gda-easy.c (original)
+++ trunk/libgda/gda-easy.c Thu Dec 11 19:58:57 2008
@@ -289,7 +289,7 @@
if (!table_name) {
g_set_error (error, GDA_EASY_ERROR, GDA_EASY_OBJECT_NAME_ERROR,
- _("Unspecified table name"));
+ "%s", _("Unspecified table name"));
return NULL;
}
@@ -320,7 +320,7 @@
type = va_arg (args, GType);
if (type == 0) {
g_set_error (error, GDA_EASY_ERROR, GDA_EASY_INCORRECT_VALUE_ERROR,
- _("Invalid type"));
+ "%s", _("Invalid type"));
g_object_unref (op);
return NULL;
}
@@ -383,7 +383,7 @@
}
else {
g_set_error (error, GDA_EASY_ERROR, GDA_EASY_OBJECT_NAME_ERROR,
- _("CREATE TABLE operation is not supported by the database server"));
+ "%s", _("CREATE TABLE operation is not supported by the database server"));
return NULL;
}
}
Modified: trunk/libgda/gda-holder.c
==============================================================================
--- trunk/libgda/gda-holder.c (original)
+++ trunk/libgda/gda-holder.c Thu Dec 11 19:58:57 2008
@@ -1492,7 +1492,7 @@
g_return_val_if_fail (bind_to->priv, FALSE);
if (holder->priv->g_type != bind_to->priv->g_type) {
g_set_error (error, GDA_HOLDER_ERROR, GDA_HOLDER_VALUE_TYPE_ERROR,
- _("Cannot bind holders if their type is not the same"));
+ "%s", _("Cannot bind holders if their type is not the same"));
return FALSE;
}
value2 = gda_holder_get_value (bind_to);
Modified: trunk/libgda/gda-meta-store.c
==============================================================================
--- trunk/libgda/gda-meta-store.c (original)
+++ trunk/libgda/gda-meta-store.c Thu Dec 11 19:58:57 2008
@@ -787,7 +787,7 @@
klass->cpriv->prep_stmts[STMT_SET_VERSION],
NULL, NULL, NULL) == -1) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_INCORRECT_SCHEMA_ERROR,
- _ ("Could not set the internal schema's version"));
+ "%s", _ ("Could not set the internal schema's version"));
return FALSE;
}
@@ -1090,7 +1090,7 @@
view_name = xmlGetProp (node, BAD_CAST "name");
if (!view_name) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing view name from <view> node"));
goto onerror;
}
@@ -1130,7 +1130,7 @@
continue;
def = xmlNodeGetContent (cnode);
if (!def) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing view definition from <view> node"));
goto onerror;
}
@@ -1196,7 +1196,7 @@
table_name = xmlGetProp (node, BAD_CAST "name");
if (!table_name) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing table name from <table> node"));
return NULL;
}
@@ -1889,7 +1889,7 @@
const GValue *version;
if (gda_data_model_get_n_rows (model) != 1) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_INCORRECT_SCHEMA_ERROR,
- _ ("Could not get the internal schema's version"));
+ "%s", _("Could not get the internal schema's version"));
g_object_unref (model);
return FALSE;
}
@@ -1900,7 +1900,7 @@
if (gda_value_is_null (version) || !gda_value_isa (version, G_TYPE_STRING)) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_INCORRECT_SCHEMA_ERROR,
- _ ("Could not get the internal schema's version"));
+ "%s", _("Could not get the internal schema's version"));
g_object_unref (model);
return FALSE;
}
@@ -1919,7 +1919,7 @@
}
else {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_INCORRECT_SCHEMA_ERROR,
- _ ("Could not get the internal schema's version"));
+ "%s", _("Could not get the internal schema's version"));
return FALSE;
}
}
@@ -2001,7 +2001,7 @@
return NULL;
if (remain) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_EXTRACT_SQL_ERROR,
- _("More than one SQL statement"));
+ "%s", _("More than one SQL statement"));
g_object_unref (stmt);
return NULL;
}
@@ -2551,7 +2551,7 @@
ncols = gda_data_model_get_n_columns (find_in);
if (ncols > gda_data_model_get_n_columns (data)) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_MODIFY_CONTENTS_ERROR,
- _("Data models should have the same number of columns"));
+ "%s", _("Data models should have the same number of columns"));
erow = -2;
}
else {
@@ -2650,7 +2650,7 @@
if (!set->select ||
(gda_statement_get_statement_type (set->select) != GDA_SQL_STATEMENT_SELECT)) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_MODIFY_CONTENTS_ERROR,
- _("Could not create SELECT statement"));
+ "%s", _("Could not create SELECT statement"));
goto out;
}
@@ -2665,7 +2665,7 @@
if (!set->delete||
(gda_statement_get_statement_type (set->delete) != GDA_SQL_STATEMENT_DELETE)) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_MODIFY_CONTENTS_ERROR,
- _("Could not create DELETE statement"));
+ "%s", _("Could not create DELETE statement"));
goto out;
}
return set;
@@ -2707,7 +2707,7 @@
}
else {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_TRANSACTION_ALREADY_STARTED_ERROR,
- _("A transaction has already been started"));
+ "%s", _("A transaction has already been started"));
return FALSE;
}
@@ -3074,7 +3074,7 @@
if (*att_name == '_') {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_ATTRIBUTE_ERROR,
- _("Attributes names starting with a '_' are reserved for internal usage"));
+ "%s", _("Attributes names starting with a '_' are reserved for internal usage"));
return FALSE;
}
@@ -3205,7 +3205,7 @@
doc = xmlParseDoc (BAD_CAST xml_description);
if (!doc) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_SCHEMA_OBJECT_DESCR_ERROR,
- _("Could not parse XML description of custom database object to add"));
+ "%s", _("Could not parse XML description of custom database object to add"));
return FALSE;
}
node = xmlDocGetRootElement (doc);
@@ -3217,12 +3217,12 @@
prop = xmlGetProp (node, BAD_CAST "name");
if (!prop) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_SCHEMA_OBJECT_DESCR_ERROR,
- _("Missing custom database object name"));
+ "%s", _("Missing custom database object name"));
goto onerror;
}
else if (*prop == '_') {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_SCHEMA_OBJECT_DESCR_ERROR,
- _("Custom database object names starting with a '_' are reserved for internal usage"));
+ "%s", _("Custom database object names starting with a '_' are reserved for internal usage"));
goto onerror;
}
@@ -3317,7 +3317,7 @@
if (conflict) {
g_set_error (error, GDA_META_STORE_ERROR, GDA_META_STORE_SCHEMA_OBJECT_CONFLICT_ERROR,
- _("Another object with the same name already exists"));
+ "%s", _("Another object with the same name already exists"));
goto onerror;
}
needs_creation = FALSE;
Modified: trunk/libgda/gda-meta-struct-io.c
==============================================================================
--- trunk/libgda/gda-meta-struct-io.c (original)
+++ trunk/libgda/gda-meta-struct-io.c Thu Dec 11 19:58:57 2008
@@ -172,7 +172,7 @@
table_name = xmlGetProp (node, BAD_CAST "name");
if (!table_name) {
g_set_error (error, GDA_META_STRUCT_ERROR, 0, /* FIXME */
- _("Missing table name from <table> node"));
+ "%s", _("Missing table name from <table> node"));
return NULL;
}
table_schema = xmlGetProp (node, BAD_CAST "schema");
Modified: trunk/libgda/gda-meta-struct.c
==============================================================================
--- trunk/libgda/gda-meta-struct.c (original)
+++ trunk/libgda/gda-meta-struct.c Thu Dec 11 19:58:57 2008
@@ -2201,7 +2201,7 @@
if (!dbo->obj_name) {
g_set_error (error, GDA_META_STRUCT_ERROR, GDA_META_STRUCT_INCOHERENCE_ERROR,
- _("Missing object name in GdaMetaDbObject structure"));
+ "%s", _("Missing object name in GdaMetaDbObject structure"));
gda_meta_db_object_free (dbo);
return NULL;
}
Modified: trunk/libgda/gda-server-operation.c
==============================================================================
--- trunk/libgda/gda-server-operation.c (original)
+++ trunk/libgda/gda-server-operation.c Thu Dec 11 19:58:57 2008
@@ -1364,7 +1364,7 @@
switch (opnode->type) {
case GDA_SERVER_OPERATION_NODE_PARAMLIST:
if (!extension) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Parameterlist values can only be set for individual parameters within it"));
allok = FALSE;
}
@@ -1421,7 +1421,7 @@
return FALSE;
}
else {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing attribute named 'path'"));
return FALSE;
}
@@ -1977,7 +1977,7 @@
switch (opnode->type) {
case GDA_SERVER_OPERATION_NODE_PARAMLIST:
if (!extension) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Parameterlist values can only be set for individual parameters within it"));
allok = FALSE;
}
Modified: trunk/libgda/gda-server-provider-extra.c
==============================================================================
--- trunk/libgda/gda-server-provider-extra.c (original)
+++ trunk/libgda/gda-server-provider-extra.c Thu Dec 11 19:58:57 2008
@@ -519,7 +519,7 @@
nbcols = gda_data_model_get_n_columns (model);
if (nbcols < gda_server_provider_get_schema_nb_columns (schema)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Data model for schema has a wrong number of columns"));
return FALSE;
}
Modified: trunk/libgda/gda-set.c
==============================================================================
--- trunk/libgda/gda-set.c (original)
+++ trunk/libgda/gda-set.c Thu Dec 11 19:58:57 2008
@@ -675,7 +675,7 @@
g_set_error (error,
GDA_SET_ERROR,
GDA_SET_XML_SPEC_ERROR,
- "XML spec. does not conform to DTD");
+ "%s", "XML spec. does not conform to DTD");
xmlDoValidityCheckingDefaultValue = xmlcheck;
return NULL;
@@ -1367,7 +1367,7 @@
for (holders = set->holders; holders; holders = holders->next) {
if (!gda_holder_is_valid ((GdaHolder*) holders->data)) {
g_set_error (error, GDA_SET_ERROR, GDA_SET_INVALID_ERROR,
- _("One or more values are invalid"));
+ "%s", _("One or more values are invalid"));
return FALSE;
}
}
Modified: trunk/libgda/gda-statement.c
==============================================================================
--- trunk/libgda/gda-statement.c (original)
+++ trunk/libgda/gda-statement.c Thu Dec 11 19:58:57 2008
@@ -648,7 +648,7 @@
return g_strdup (stmt->priv->internal_struct->sql);
else {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Missing SQL code"));
+ "%s", _("Missing SQL code"));
return NULL;
}
}
@@ -1199,7 +1199,7 @@
if (! pspec->name) {
g_set_error (error, GDA_STATEMENT_ERROR, GDA_STATEMENT_PARAM_ERROR,
- _("Unnamed parameter"));
+ "%s", _("Unnamed parameter"));
goto err;
}
quoted_pname = gda_sql_identifier_add_quotes (pspec->name);
@@ -1765,14 +1765,14 @@
GdaSqlSelectFrom *from = (GdaSqlSelectFrom *) GDA_SQL_ANY_PART (join)->parent;
if (!from || (GDA_SQL_ANY_PART (from)->type != GDA_SQL_ANY_SQL_SELECT_FROM)) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Join is not in a FROM statement"));
+ "%s", _("Join is not in a FROM statement"));
goto err;
}
GdaSqlSelectTarget *target;
target = g_slist_nth_data (from->targets, join->position);
if (!target || (GDA_SQL_ANY_PART (target)->type != GDA_SQL_ANY_SQL_SELECT_TARGET)) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Could not find target the join is for"));
+ "%s", _("Could not find target the join is for"));
goto err;
}
str = context->render_select_target (GDA_SQL_ANY_PART (target), context, error);
Modified: trunk/libgda/gda-util.c
==============================================================================
--- trunk/libgda/gda-util.c (original)
+++ trunk/libgda/gda-util.c Thu Dec 11 19:58:57 2008
@@ -646,19 +646,19 @@
stsel = (GdaSqlStatementSelect*) sel_struct->contents;
if (!stsel->from) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("SELECT statement has no FROM part"));
+ "%s", _("SELECT statement has no FROM part"));
return FALSE;
}
if (stsel->from->targets && stsel->from->targets->next) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("SELECT statement involves more than one table or expression"));
+ "%s", _("SELECT statement involves more than one table or expression"));
return FALSE;
}
GdaSqlSelectTarget *target;
target = (GdaSqlSelectTarget*) stsel->from->targets->data;
if (!target->table_name) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("SELECT statement involves more than one table or expression"));
+ "%s", _("SELECT statement involves more than one table or expression"));
return FALSE;
}
if (!gda_sql_statement_check_validity (sel_struct, cnc, error))
@@ -668,7 +668,7 @@
g_assert (target->validity_meta_object); /* because gda_sql_statement_check_validity() returned TRUE */
if (target->validity_meta_object->obj_type != GDA_META_DB_TABLE) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Can only build modification statement for tables"));
+ "%s", _("Can only build modification statement for tables"));
return FALSE;
}
@@ -687,7 +687,7 @@
if (mtable->pk_cols_nb == 0) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Table does not have any primary key"));
+ "%s", _("Table does not have any primary key"));
return NULL;
}
@@ -695,7 +695,7 @@
if (require_pk) {
if (mtable->pk_cols_nb == 0) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Table does not have any primary key"));
+ "%s", _("Table does not have any primary key"));
goto onerror;
}
else if (mtable->pk_cols_nb > 1) {
@@ -721,7 +721,7 @@
}
if (!sfield) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Table's primary key is not selected"));
+ "%s", _("Table's primary key is not selected"));
goto onerror;
}
else {
@@ -913,7 +913,7 @@
/* To translators: this error message occurs when no "INSERT INTO <table> (field1, ...)..."
* SQL statement can be computed because no table field can be used */
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Could not compute any field to insert into"));
+ "%s", _("Could not compute any field to insert into"));
retval = FALSE;
goto cleanup;
}
Modified: trunk/libgda/gda-xa-transaction.c
==============================================================================
--- trunk/libgda/gda-xa-transaction.c (original)
+++ trunk/libgda/gda-xa-transaction.c Thu Dec 11 19:58:57 2008
@@ -292,7 +292,7 @@
if (g_object_get_data (G_OBJECT (cnc), "_gda_xa_transaction")) {
g_set_error (error, GDA_XA_TRANSACTION_ERROR,
GDA_XA_TRANSACTION_ALREADY_REGISTERED_ERROR,
- _("Connection aleardy registered with another GdaXaTransaction object"));
+ "%s", _("Connection aleardy registered with another GdaXaTransaction object"));
return FALSE;
}
@@ -305,7 +305,7 @@
if (xa_trans->priv->non_xa_cnc) {
g_set_error (error, GDA_XA_TRANSACTION_ERROR,
GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR,
- _("Connection does not support distributed transaction"));
+ "%s", _("Connection does not support distributed transaction"));
return FALSE;
}
else
Modified: trunk/libgda/sql-parser/gda-sql-parser.c
==============================================================================
--- trunk/libgda/sql-parser/gda-sql-parser.c (original)
+++ trunk/libgda/sql-parser/gda-sql-parser.c Thu Dec 11 19:58:57 2008
@@ -626,10 +626,10 @@
else if (error) {
if ((ntokens <= 1) && (parser->priv->context->token_type != L_ILLEGAL))
g_set_error (error, GDA_SQL_PARSER_ERROR, GDA_SQL_PARSER_EMPTY_SQL_ERROR,
- _ ("SQL code does not contain any statement"));
+ "%s", _("SQL code does not contain any statement"));
else
g_set_error (error, GDA_SQL_PARSER_ERROR, parser->priv->error_type,
- parser->priv->error_msg);
+ "%s", parser->priv->error_msg);
}
}
@@ -714,7 +714,7 @@
if ((n_stmt == 0) && (n_empty != 0))
g_set_error (error, GDA_SQL_PARSER_ERROR, GDA_SQL_PARSER_EMPTY_SQL_ERROR,
- _("SQL code does not contain any statement"));
+ "%s", _("SQL code does not contain any statement"));
if (!allok || (n_stmt == 0)) {
if (remain)
Modified: trunk/libgda/sql-parser/gda-statement-struct-compound.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-compound.c (original)
+++ trunk/libgda/sql-parser/gda-statement-struct-compound.c Thu Dec 11 19:58:57 2008
@@ -201,7 +201,7 @@
{
if (!compound || !compound->stmt_list) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement contains an undefined COMPOUND statement"));
+ "%s", _("COMPOUND statement contains an undefined COMPOUND statement"));
return -1;
}
@@ -210,7 +210,7 @@
if (sqlstmt->stmt_type == GDA_SQL_STATEMENT_SELECT) {
if (!sqlstmt->contents) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement contains an undefined SELECT statement"));
+ "%s", _("COMPOUND statement contains an undefined SELECT statement"));
return -1;
}
return g_slist_length (((GdaSqlStatementSelect*) sqlstmt->contents)->expr_list);
@@ -219,7 +219,7 @@
return gda_sql_statement_compound_get_n_cols ((GdaSqlStatementCompound*) sqlstmt->contents, error);
else {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement contains a non SELECT statement"));
+ "%s", _("COMPOUND statement contains a non SELECT statement"));
return -1;
}
}
@@ -233,13 +233,13 @@
if (!compound->stmt_list) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement does not contain any SELECT statement"));
+ "%s", _("COMPOUND statement does not contain any SELECT statement"));
return FALSE;
}
if (!compound->stmt_list->next) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement only contains one SELECT statement"));
+ "%s", _("COMPOUND statement only contains one SELECT statement"));
return FALSE;
}
@@ -249,7 +249,7 @@
if (sqlstmt->stmt_type == GDA_SQL_STATEMENT_SELECT) {
if (!sqlstmt->contents) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement contains an undefined SELECT statement"));
+ "%s", _("COMPOUND statement contains an undefined SELECT statement"));
return FALSE;
}
nb = g_slist_length (((GdaSqlStatementSelect*) sqlstmt->contents)->expr_list);
@@ -261,7 +261,7 @@
}
else {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement contains a non SELECT statement"));
+ "%s", _("COMPOUND statement contains a non SELECT statement"));
return FALSE;
}
@@ -269,13 +269,13 @@
nb_cols = nb;
if (nb == 0) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("COMPOUND statement contains an empty SELECT statement"));
+ "%s", _("COMPOUND statement contains an empty SELECT statement"));
return FALSE;
}
}
else if (nb != nb_cols) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("All statements in a COMPOUND must have the same number of columns"));
+ "%s", _("All statements in a COMPOUND must have the same number of columns"));
return FALSE;
}
}
Modified: trunk/libgda/sql-parser/gda-statement-struct-delete.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-delete.c (original)
+++ trunk/libgda/sql-parser/gda-statement-struct-delete.c Thu Dec 11 19:58:57 2008
@@ -141,7 +141,7 @@
GdaSqlStatementDelete *delete = (GdaSqlStatementDelete *) stmt;
if (!delete->table) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("DELETE statement needs a table to delete from"));
+ "%s", _("DELETE statement needs a table to delete from"));
return FALSE;
}
Modified: trunk/libgda/sql-parser/gda-statement-struct-insert.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-insert.c (original)
+++ trunk/libgda/sql-parser/gda-statement-struct-insert.c Thu Dec 11 19:58:57 2008
@@ -301,13 +301,13 @@
nb_values = g_slist_length (insert->fields_list); /* may be 0 */
if (!insert->table) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("INSERT statement needs a table to insert into"));
+ "%s", _("INSERT statement needs a table to insert into"));
return FALSE;
}
if (insert->select) {
if (insert->values_list) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Can't specify values to insert and SELECT statement in INSERT statement"));
+ "%s", _("Can't specify values to insert and SELECT statement in INSERT statement"));
return FALSE;
}
if (nb_values > 0) {
@@ -326,7 +326,7 @@
g_assert_not_reached ();
if (len != nb_values) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("INSERT statement does not have the same number of target columns and expressions"));
+ "%s", _("INSERT statement does not have the same number of target columns and expressions"));
return FALSE;
}
}
@@ -335,7 +335,7 @@
/* using values list */
if (!insert->values_list) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Missing values to insert in INSERT statement"));
+ "%s", _("Missing values to insert in INSERT statement"));
return FALSE;
}
@@ -344,7 +344,7 @@
nb_values = g_slist_length ((GSList *) list->data);
if (nb_values == 0) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Missing values to insert in INSERT statement"));
+ "%s", _("Missing values to insert in INSERT statement"));
return FALSE;
}
}
@@ -352,10 +352,10 @@
if (g_slist_length ((GSList *) list->data) != nb_values) {
if (insert->fields_list)
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("INSERT statement does not have the same number of target columns and expressions"));
+ "%s", _("INSERT statement does not have the same number of target columns and expressions"));
else
g_set_error (error, GDA_SQL_ERROR, 0,
- _("VALUES lists must all be the same length in INSERT statement"));
+ "%s", _("VALUES lists must all be the same length in INSERT statement"));
return FALSE;
}
}
Modified: trunk/libgda/sql-parser/gda-statement-struct-select.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-select.c (original)
+++ trunk/libgda/sql-parser/gda-statement-struct-select.c Thu Dec 11 19:58:57 2008
@@ -314,25 +314,25 @@
GdaSqlStatementSelect *select = (GdaSqlStatementSelect *) stmt;
if (!select->expr_list) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("SELECT does not contain any expression"));
+ "%s", _("SELECT does not contain any expression"));
return FALSE;
}
if (select->distinct_expr && !select->distinct) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("SELECT can't have a DISTINCT expression if DISTINCT is not set"));
+ "%s", _("SELECT can't have a DISTINCT expression if DISTINCT is not set"));
return FALSE;
}
if (select->having_cond && !select->group_by) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("SELECT can't have a HAVING without GROUP BY"));
+ "%s", _("SELECT can't have a HAVING without GROUP BY"));
return FALSE;
}
if (select->limit_offset && !select->limit_count) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("SELECT can't have a limit offset without a limit"));
+ "%s", _("SELECT can't have a limit offset without a limit"));
return FALSE;
}
return TRUE;
Modified: trunk/libgda/sql-parser/gda-statement-struct-update.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-update.c (original)
+++ trunk/libgda/sql-parser/gda-statement-struct-update.c Thu Dec 11 19:58:57 2008
@@ -234,19 +234,19 @@
if (!update->table) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("UPDATE statement needs a table to update data"));
+ "%s", _("UPDATE statement needs a table to update data"));
return FALSE;
}
if (g_slist_length (update->fields_list) != g_slist_length (update->expr_list)) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("UPDATE statement does not have the same number of target columns and expressions"));
+ "%s", _("UPDATE statement does not have the same number of target columns and expressions"));
return FALSE;
}
if (!update->fields_list) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("UPDATE statement does not have any target columns to update"));
+ "%s", _("UPDATE statement does not have any target columns to update"));
return FALSE;
}
Modified: trunk/libgda/sql-parser/gda-statement-struct.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct.c (original)
+++ trunk/libgda/sql-parser/gda-statement-struct.c Thu Dec 11 19:58:57 2008
@@ -471,7 +471,7 @@
any = any->parent);
if (!any) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("GdaSqlField is not part of an INSERT or UPDATE statement"));
+ "%s", _("GdaSqlField is not part of an INSERT or UPDATE statement"));
return FALSE;
}
@@ -484,7 +484,7 @@
if (!stable) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_VALIDATION_ERROR,
- _("Missing table in statement"));
+ "%s", _("Missing table in statement"));
return FALSE;
}
if (!stable->validity_meta_object) {
@@ -539,7 +539,7 @@
for (any = part->parent; any && any->parent; any = any->parent);
if (!any)
g_set_error (&lerror, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("GdaSqlSelectField is not part of a SELECT statement"));
+ "%s", _("GdaSqlSelectField is not part of a SELECT statement"));
else {
switch (any->type) {
case GDA_SQL_ANY_STMT_SELECT: {
@@ -598,7 +598,7 @@
if (!table->table_name) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_VALIDATION_ERROR,
- _("Missing table name in statement"));
+ "%s", _("Missing table name in statement"));
return FALSE;
}
@@ -666,7 +666,7 @@
any = any->parent);
if (!any) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("GdaSqlSelectField is not part of a SELECT statement"));
+ "%s", _("GdaSqlSelectField is not part of a SELECT statement"));
return FALSE;
}
@@ -880,7 +880,7 @@
GdaSqlExpr *expr = (GdaSqlExpr*) node;
if (expr->cast_as && expr->param_spec) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Expression can't have both a type cast and a parameter specification"));
+ "%s", _("Expression can't have both a type cast and a parameter specification"));
return FALSE;
}
break;
@@ -893,7 +893,7 @@
_("'%s' is not a valid identifier"), field->field_name);
else
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_MALFORMED_IDENTIFIER_ERROR,
- _("Empty identifier"));
+ "%s", _("Empty identifier"));
return FALSE;
}
break;
@@ -906,7 +906,7 @@
_("'%s' is not a valid identifier"), table->table_name);
else
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_MALFORMED_IDENTIFIER_ERROR,
- _("Empty identifier"));
+ "%s", _("Empty identifier"));
return FALSE;
}
break;
@@ -919,7 +919,7 @@
_("'%s' is not a valid identifier"), function->function_name);
else
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_MALFORMED_IDENTIFIER_ERROR,
- _("Empty identifier"));
+ "%s", _("Empty identifier"));
return FALSE;
}
break;
@@ -928,7 +928,7 @@
GdaSqlOperation *operation = (GdaSqlOperation*) node;
if (!operation->operands) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Operation has no operand"));
+ "%s", _("Operation has no operand"));
return FALSE;
}
switch (operation->operator_type) {
@@ -951,14 +951,14 @@
case GDA_SQL_OPERATOR_TYPE_BITOR:
if (g_slist_length (operation->operands) != 2) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Wrong number of operands"));
+ "%s", _("Wrong number of operands"));
return FALSE;
}
break;
case GDA_SQL_OPERATOR_TYPE_BETWEEN:
if (g_slist_length (operation->operands) != 3) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Wrong number of operands"));
+ "%s", _("Wrong number of operands"));
return FALSE;
}
break;
@@ -968,7 +968,7 @@
case GDA_SQL_OPERATOR_TYPE_NOT:
if (g_slist_length (operation->operands) != 1) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Wrong number of operands"));
+ "%s", _("Wrong number of operands"));
return FALSE;
}
break;
@@ -980,7 +980,7 @@
case GDA_SQL_OPERATOR_TYPE_STAR:
if (g_slist_length (operation->operands) < 2) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Wrong number of operands"));
+ "%s", _("Wrong number of operands"));
return FALSE;
}
break;
@@ -988,7 +988,7 @@
case GDA_SQL_OPERATOR_TYPE_PLUS:
if (g_slist_length (operation->operands) == 0) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Wrong number of operands"));
+ "%s", _("Wrong number of operands"));
return FALSE;
}
break;
@@ -1003,12 +1003,12 @@
GdaSqlCase *sc = (GdaSqlCase*) node;
if (g_slist_length (sc->when_expr_list) != g_slist_length (sc->then_expr_list)) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- "Number of WHEN is not the same as number of THEN in CASE expression");
+ "%s", "Number of WHEN is not the same as number of THEN in CASE expression");
return FALSE;
}
if (!sc->when_expr_list) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- "CASE expression must have at least one WHEN ... THEN element");
+ "%s", "CASE expression must have at least one WHEN ... THEN element");
return FALSE;
}
break;
@@ -1017,7 +1017,7 @@
GdaSqlSelectField *field = (GdaSqlSelectField*) node;
if (!field->expr) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Missing expression in select field"));
+ "%s", _("Missing expression in select field"));
return FALSE;
}
break;
@@ -1026,7 +1026,7 @@
GdaSqlSelectTarget *target = (GdaSqlSelectTarget*) node;
if (!target->expr) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Missing expression in select target"));
+ "%s", _("Missing expression in select target"));
return FALSE;
}
break;
@@ -1035,12 +1035,12 @@
GdaSqlSelectJoin *join = (GdaSqlSelectJoin*) node;
if (join->expr && join->use) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Join can't at the same time specify a join condition and a list of fields to join on"));
+ "%s", _("Join can't at the same time specify a join condition and a list of fields to join on"));
return FALSE;
}
if ((join->type == GDA_SQL_SELECT_JOIN_CROSS) && (join->expr || join->use)) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Cross join can't have a join condition or a list of fields to join on"));
+ "%s", _("Cross join can't have a join condition or a list of fields to join on"));
return FALSE;
}
break;
@@ -1049,7 +1049,7 @@
GdaSqlSelectFrom *from = (GdaSqlSelectFrom*) node;
if (!from->targets) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Empty FROM clause"));
+ "%s", _("Empty FROM clause"));
return FALSE;
}
break;
@@ -1058,7 +1058,7 @@
GdaSqlSelectOrder *order = (GdaSqlSelectOrder*) node;
if (!order->expr) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- "ORDER BY expression must have an expression");
+ "%s", "ORDER BY expression must have an expression");
return FALSE;
}
break;
@@ -1323,7 +1323,7 @@
gint nodepos = g_slist_index (((GdaSqlStatementSelect*) parent_node)->expr_list, node);
if (parent_node->type != GDA_SQL_ANY_STMT_SELECT) {
g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
- _("Select field is not in a SELECT statement"));
+ "%s", _("Select field is not in a SELECT statement"));
return FALSE;
}
for (list = mtable->columns; list; list = list->next) {
Modified: trunk/libgda/sqlite/gda-sqlite-ddl.c
==============================================================================
--- trunk/libgda/sqlite/gda-sqlite-ddl.c (original)
+++ trunk/libgda/sqlite/gda-sqlite-ddl.c Thu Dec 11 19:58:57 2008
@@ -213,7 +213,7 @@
if (!hasfields) {
allok = FALSE;
- g_set_error (error, 0, 0, _("Table to create must have at least one row"));
+ g_set_error (error, 0, 0, "%s", _("Table to create must have at least one row"));
}
g_slist_free (pkfields);
Modified: trunk/libgda/sqlite/gda-sqlite-provider.c
==============================================================================
--- trunk/libgda/sqlite/gda-sqlite-provider.c (original)
+++ trunk/libgda/sqlite/gda-sqlite-provider.c Thu Dec 11 19:58:57 2008
@@ -913,7 +913,7 @@
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous server operation"));
+ "%s", _("Provider does not support asynchronous server operation"));
return FALSE;
}
@@ -944,7 +944,7 @@
g_free (filename);
if (errmsg != SQLITE_OK) {
- g_set_error (error, 0, 0, sqlite3_errmsg (cdata->connection));
+ g_set_error (error, 0, 0, "%s", sqlite3_errmsg (cdata->connection));
retval = FALSE;
}
gda_sqlite_free_cnc_data (cdata);
@@ -972,14 +972,14 @@
if (g_unlink (filename)) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_OPERATION_ERROR,
- sys_errlist [errno]);
+ "%s", sys_errlist [errno]);
retval = FALSE;
}
g_free (filename);
}
else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_OPERATION_ERROR,
- _("Missing database name or directory"));
+ "%s", _("Missing database name or directory"));
retval = FALSE;
}
@@ -1622,7 +1622,7 @@
status = sqlite3_prepare_v2 (cdata->connection, sql, -1, &sqlite_stmt, &left);
if (status != SQLITE_OK) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- sqlite3_errmsg (cdata->connection));
+ "%s", sqlite3_errmsg (cdata->connection));
goto out_err;
}
@@ -1642,7 +1642,7 @@
}
else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- _("Unnamed parameter is not allowed in prepared statements"));
+ "%s", _("Unnamed parameter is not allowed in prepared statements"));
g_slist_foreach (param_ids, (GFunc) g_free, NULL);
g_slist_free (param_ids);
goto out_err;
@@ -1830,7 +1830,7 @@
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous statement execution"));
+ "%s", _("Provider does not support asynchronous statement execution"));
return NULL;
}
@@ -1877,7 +1877,7 @@
status = sqlite3_prepare_v2 (cdata->connection, sql, -1, &sqlite_stmt, (const char**) &left);
if (status != SQLITE_OK) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- sqlite3_errmsg (cdata->connection));
+ "%s", sqlite3_errmsg (cdata->connection));
g_free (sql);
return NULL;
}
@@ -1917,7 +1917,7 @@
gda_connection_add_event (cnc, event);
gda_connection_del_prepared_statement (cnc, stmt);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_EMPTY_STMT_ERROR,
- errmsg);
+ "%s", errmsg);
if (new_ps)
g_object_unref (ps);
return NULL;
@@ -1935,7 +1935,7 @@
gda_connection_add_event (cnc, event);
gda_connection_del_prepared_statement (cnc, stmt);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- errmsg);
+ "%s", errmsg);
if (new_ps)
g_object_unref (ps);
return NULL;
@@ -1954,7 +1954,7 @@
gda_connection_event_set_description (event, _("Missing parameter(s) to execute query"));
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
- _("Missing parameter(s) to execute query"));
+ "%s", _("Missing parameter(s) to execute query"));
break;
}
@@ -1973,7 +1973,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
g_free (str);
break;
}
@@ -1992,7 +1992,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
g_free (str);
break;
}
@@ -2086,7 +2086,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
g_free (str);
break;
}
@@ -2140,7 +2140,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, errmsg);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR, errmsg);
+ "%s", GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR, errmsg);
sqlite3_reset (ps->sqlite_stmt);
gda_connection_add_event (cnc, event);
gda_connection_internal_statement_executed (cnc, stmt, params, event);
Modified: trunk/libgda/sqlite/gda-sqlite-recordset.c
==============================================================================
--- trunk/libgda/sqlite/gda-sqlite-recordset.c (original)
+++ trunk/libgda/sqlite/gda-sqlite-recordset.c Thu Dec 11 19:58:57 2008
@@ -425,7 +425,7 @@
break;
case SQLITE_ERROR:
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_INTERNAL_ERROR, sqlite3_errmsg (cdata->connection));
+ GDA_SERVER_PROVIDER_INTERNAL_ERROR, "%s", sqlite3_errmsg (cdata->connection));
break;
case SQLITE_DONE:
GDA_DATA_SELECT (model)->advertized_nrows = model->priv->next_row_num;
@@ -433,7 +433,7 @@
case SQLITE_MISUSE:
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("SQLite provider fatal internal error"));
+ "%s", _("SQLite provider fatal internal error"));
break;
}
return prow;
Modified: trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c
==============================================================================
--- trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c (original)
+++ trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c Thu Dec 11 19:58:57 2008
@@ -253,7 +253,7 @@
rc = sqlite3_exec (scnc->connection, str, NULL, 0, &zErrMsg);
g_free (str);
if (rc != SQLITE_OK) {
- g_set_error (error, 0, 0, g_strdup (zErrMsg));
+ g_set_error (error, 0, 0, "%s", zErrMsg);
sqlite3_free (zErrMsg);
gda_vconnection_data_model_table_data_free (td);
cnc->priv->table_data_list = g_slist_remove (cnc->priv->table_data_list, td);
@@ -301,7 +301,7 @@
td = gda_vconnection_get_table_data_by_name (cnc, table_name);
if (!td) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s", "%s",
_("Table to remove not found"));
return FALSE;
}
@@ -312,7 +312,7 @@
g_free (str);
if (rc != SQLITE_OK) {
- g_set_error (error, 0, 0, g_strdup (zErrMsg));
+ g_set_error (error, 0, 0, "%s", zErrMsg);
sqlite3_free (zErrMsg);
return FALSE;
}
Modified: trunk/libgda/sqlite/virtual/gda-vconnection-hub.c
==============================================================================
--- trunk/libgda/sqlite/virtual/gda-vconnection-hub.c (original)
+++ trunk/libgda/sqlite/virtual/gda-vconnection-hub.c Thu Dec 11 19:58:57 2008
@@ -204,7 +204,7 @@
/* check for constraints */
hc = get_hub_cnc_by_ns (hub, ns);
if (hc && (hc->cnc != cnc)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Namespace must be specified"));
return FALSE;
}
@@ -213,7 +213,7 @@
return TRUE;
if (!gda_connection_is_opened (cnc)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Connection is closed"));
return FALSE;
}
@@ -254,7 +254,7 @@
hc = get_hub_cnc_by_cnc (hub, cnc);
if (!hc) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Connection was not represented in hub"));
return FALSE;
}
Modified: trunk/libgda/sqlite/virtual/gda-virtual-connection.c
==============================================================================
--- trunk/libgda/sqlite/virtual/gda-virtual-connection.c (original)
+++ trunk/libgda/sqlite/virtual/gda-virtual-connection.c Thu Dec 11 19:58:57 2008
@@ -147,8 +147,8 @@
}
}
else
- g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_PROVIDER_ERROR,
- _("Internal error: virtual provider does not implement the create_operation() virtual method"));
+ g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_PROVIDER_ERROR, "%s",
+ "%s", _("Internal error: virtual provider does not implement the create_operation() virtual method"));
return cnc;
}
Modified: trunk/providers/firebird/gda-firebird-ddl.c
==============================================================================
--- trunk/providers/firebird/gda-firebird-ddl.c (original)
+++ trunk/providers/firebird/gda-firebird-ddl.c Thu Dec 11 19:58:57 2008
@@ -133,7 +133,7 @@
if (!hasfields) {
allok = FALSE;
- g_set_error (error, 0, 0, _("Table to create must have at least one row"));
+ g_set_error (error, 0, 0, "%s", _("Table to create must have at least one row"));
}
g_slist_free (pkfields);
Modified: trunk/providers/firebird/gda-firebird-provider.c
==============================================================================
--- trunk/providers/firebird/gda-firebird-provider.c (original)
+++ trunk/providers/firebird/gda-firebird-provider.c Thu Dec 11 19:58:57 2008
@@ -632,7 +632,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous server operation"));
+ "%s", _("Provider does not support asynchronous server operation"));
return FALSE;
}
@@ -1043,7 +1043,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous statement execution"));
+ "%s", _("Provider does not support asynchronous statement execution"));
return FALSE;
}
@@ -1086,7 +1086,7 @@
gda_connection_event_set_description (event, _("Missing parameter(s) to execute query"));
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
- _("Missing parameter(s) to execute query"));
+ "%s", _("Missing parameter(s) to execute query"));
break;
}
@@ -1104,7 +1104,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
g_free (str);
break;
}
Modified: trunk/providers/jdbc/gda-jdbc-ddl.c
==============================================================================
--- trunk/providers/jdbc/gda-jdbc-ddl.c (original)
+++ trunk/providers/jdbc/gda-jdbc-ddl.c Thu Dec 11 19:58:57 2008
@@ -133,7 +133,7 @@
if (!hasfields) {
allok = FALSE;
- g_set_error (error, 0, 0, _("Table to create must have at least one row"));
+ g_set_error (error, 0, 0, "%s", _("Table to create must have at least one row"));
}
g_slist_free (pkfields);
Modified: trunk/providers/jdbc/gda-jdbc-provider.c
==============================================================================
--- trunk/providers/jdbc/gda-jdbc-provider.c (original)
+++ trunk/providers/jdbc/gda-jdbc-provider.c Thu Dec 11 19:58:57 2008
@@ -563,7 +563,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous server operation"));
+ "%s", _("Provider does not support asynchronous server operation"));
return FALSE;
}
@@ -1100,7 +1100,7 @@
}
else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- _("Unnamed parameter is not allowed in prepared statements"));
+ "%s", _("Unnamed parameter is not allowed in prepared statements"));
g_slist_foreach (param_ids, (GFunc) g_free, NULL);
g_slist_free (param_ids);
g_free (ctypes);
@@ -1198,7 +1198,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous statement execution"));
+ "%s", _("Provider does not support asynchronous statement execution"));
return NULL;
}
@@ -1288,7 +1288,7 @@
gda_connection_event_set_description (event, _("Missing parameter(s) to execute query"));
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
- _("Missing parameter(s) to execute query"));
+ "%s", _("Missing parameter(s) to execute query"));
break;
}
@@ -1697,7 +1697,7 @@
g_return_val_if_fail (jdbc_driver, NULL);
if (!_jdbc_provider_java_vm) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"No JVM runtime identified (this should not happen at this point)!");
return NULL;
}
Modified: trunk/providers/jdbc/gda-jdbc-util.c
==============================================================================
--- trunk/providers/jdbc/gda-jdbc-util.c (original)
+++ trunk/providers/jdbc/gda-jdbc-util.c Thu Dec 11 19:58:57 2008
@@ -82,13 +82,13 @@
atres = (*_jdbc_provider_java_vm)->GetEnv (_jdbc_provider_java_vm, (void**) &env, JNI_VERSION_1_2);
if (atres == JNI_EDETACHED) {
if ((*_jdbc_provider_java_vm)->AttachCurrentThread (_jdbc_provider_java_vm, (void**) &env, NULL) < 0)
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Could not attach JAVA virtual machine's current thread");
else
*out_needs_detach = TRUE;
}
else if (atres == JNI_EVERSION)
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Could not attach JAVA virtual machine's current thread");
return env;
}
Modified: trunk/providers/jdbc/jni-wrapper.c
==============================================================================
--- trunk/providers/jdbc/jni-wrapper.c (original)
+++ trunk/providers/jdbc/jni-wrapper.c Thu Dec 11 19:58:57 2008
@@ -72,7 +72,7 @@
{
*out_jvm = NULL;
#ifndef JNI_VERSION_1_2
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Java 1.2 or more is needed");
return NULL;
#else
@@ -86,7 +86,7 @@
const gchar *tmp;
if (!create_func) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"The JNI_CreateJavaVM is not identified (as the create_func argument)");
return NULL;
}
@@ -141,7 +141,7 @@
g_string_free (classpath, TRUE);
g_free (options[2].optionString);
if ((result == JNI_ERR) || !env) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Can't invoke the JVM");
return NULL;
}
@@ -382,7 +382,7 @@
return TRUE;
fallback:
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"An exception occurred");
if (exc_value) {
g_value_unset (exc_value);
@@ -971,7 +971,7 @@
return TRUE;
wrong_type:
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Wrong value type");
return FALSE;
}
Modified: trunk/providers/mysql/gda-mysql-ddl.c
==============================================================================
--- trunk/providers/mysql/gda-mysql-ddl.c (original)
+++ trunk/providers/mysql/gda-mysql-ddl.c Thu Dec 11 19:58:57 2008
@@ -250,7 +250,7 @@
node = gda_server_operation_get_node_info (op, "/FKEY_S/%d/FKEY_FIELDS_A", i);
if (!node || ((nbfields = gda_data_model_get_n_rows (node->model)) == 0)) {
allok = FALSE;
- g_set_error (error, 0, 0, _("No field specified in foreign key constraint"));
+ g_set_error (error, 0, 0, "%s", _("No field specified in foreign key constraint"));
}
else {
for (j = 0; j < nbfields; j++) {
@@ -262,7 +262,7 @@
g_string_append (string, g_value_get_string (value));
else {
allok = FALSE;
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Empty field specified in foreign key constraint"));
}
}
@@ -273,7 +273,7 @@
g_string_append (string, g_value_get_string (value));
else {
allok = FALSE;
- g_set_error (error, 0, 0, _("No referenced table specified in foreign key constraint"));
+ g_set_error (error, 0, 0, "%s", _("No referenced table specified in foreign key constraint"));
}
g_string_append (string, " (");
@@ -286,7 +286,7 @@
g_string_append (string, g_value_get_string (value));
else {
allok = FALSE;
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Empty referenced field specified in foreign key constraint"));
}
}
@@ -308,7 +308,7 @@
if (!hasfields) {
allok = FALSE;
- g_set_error (error, 0, 0, _("Table to create must have at least one row"));
+ g_set_error (error, 0, 0, "%s", _("Table to create must have at least one row"));
}
/* other options */
@@ -778,7 +778,7 @@
g_string_append_c (string, ' ');
}
else {
- g_set_error (error, 0, 0, _("Incorrect specified column name"));
+ g_set_error (error, 0, 0, "%s", _("Incorrect specified column name"));
allok = FALSE;
}
}
Modified: trunk/providers/mysql/gda-mysql-meta.c
==============================================================================
--- trunk/providers/mysql/gda-mysql-meta.c (original)
+++ trunk/providers/mysql/gda-mysql-meta.c Thu Dec 11 19:58:57 2008
@@ -711,7 +711,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -761,7 +761,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -967,7 +967,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -1034,7 +1034,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -1099,7 +1099,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -1343,7 +1343,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -1415,7 +1415,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -1451,7 +1451,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
@@ -1517,7 +1517,7 @@
return FALSE;
if (cdata->version_long < 50000) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("Mysql version 5.0 at least is required"));
+ "%s", _("Mysql version 5.0 at least is required"));
return FALSE;
}
Modified: trunk/providers/mysql/gda-mysql-provider.c
==============================================================================
--- trunk/providers/mysql/gda-mysql-provider.c (original)
+++ trunk/providers/mysql/gda-mysql-provider.c Thu Dec 11 19:58:57 2008
@@ -401,7 +401,7 @@
/* Exclusive: host/pair otherwise unix socket. */
if ((host || port >= 0) && socket) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Cannot give a UNIX SOCKET if you also provide "
"either a HOST or a PORT"));
return NULL;
@@ -431,7 +431,7 @@
(port > 0) ? port : 0,
socket, flags);
if (!return_mysql || mysql != return_mysql) {
- g_set_error (error, 0, 0, mysql_error (mysql));
+ g_set_error (error, 0, 0, "%s", mysql_error (mysql));
g_free (mysql);
mysql = NULL;
}
@@ -441,7 +441,7 @@
#if MYSQL_VERSION_ID < 32200
if (mysql &&
mysql_select_db (mysql, db) != 0) {
- g_set_error (error, 0, 0, mysql_error (mysql));
+ g_set_error (error, 0, 0, "%s", mysql_error (mysql));
g_free (mysql);
mysql = NULL;
}
@@ -817,7 +817,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous server operation"));
+ "%s", _("Provider does not support asynchronous server operation"));
return FALSE;
}
@@ -1208,7 +1208,7 @@
} else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- _("Unnamed statement parameter is not allowed in prepared statement."));
+ "%s", _("Unnamed statement parameter is not allowed in prepared statement."));
g_slist_foreach (param_ids, (GFunc) g_free, NULL);
g_slist_free (param_ids);
param_ids = NULL;
@@ -1305,7 +1305,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous statement execution"));
+ "%s", _("Provider does not support asynchronous statement execution"));
return FALSE;
}
@@ -1373,7 +1373,7 @@
gda_connection_event_set_description (event, _("Missing parameter(s) to execute query"));
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
- _("Missing parameter(s) to execute query"));
+ "%s", _("Missing parameter(s) to execute query"));
break;
}
@@ -1393,7 +1393,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, "%s", str);
g_free (str);
break;
} else {
@@ -1413,7 +1413,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, "%s", str);
g_free (str);
break;
} else {
Modified: trunk/providers/mysql/gda-mysql-util.c
==============================================================================
--- trunk/providers/mysql/gda-mysql-util.c (original)
+++ trunk/providers/mysql/gda-mysql-util.c Thu Dec 11 19:58:57 2008
@@ -46,7 +46,7 @@
gda_connection_event_set_code
(event_error, GDA_CONNECTION_EVENT_CODE_UNKNOWN);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
- mysql_error (mysql));
+ "%s", mysql_error (mysql));
//g_print ("%s: %s\n", __func__, mysql_error (mysql));
@@ -58,7 +58,7 @@
gda_connection_event_set_code
(event_error, GDA_CONNECTION_EVENT_CODE_UNKNOWN);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
- mysql_stmt_error (mysql_stmt));
+ "%s", mysql_stmt_error (mysql_stmt));
//g_print ("%s : %s\n", __func__, mysql_stmt_error (mysql_stmt));
@@ -70,7 +70,7 @@
gda_connection_event_set_code
(event_error, GDA_CONNECTION_EVENT_CODE_UNKNOWN);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
- _("No detail"));
+ "%s", _("No detail"));
}
gda_connection_event_set_source (event_error, "gda-mysql");
Modified: trunk/providers/postgres/gda-postgres-ddl.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-ddl.c (original)
+++ trunk/providers/postgres/gda-postgres-ddl.c Thu Dec 11 19:58:57 2008
@@ -266,7 +266,7 @@
node = gda_server_operation_get_node_info (op, "/FKEY_S/%d/FKEY_FIELDS_A", i);
if (!node || ((nbfields = gda_data_model_get_n_rows (node->model)) == 0)) {
allok = FALSE;
- g_set_error (error, 0, 0, _("No field specified in foreign key constraint"));
+ g_set_error (error, 0, 0, "%s", _("No field specified in foreign key constraint"));
}
else {
for (j = 0; j < nbfields; j++) {
@@ -282,7 +282,7 @@
}
else {
allok = FALSE;
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Empty field specified in foreign key constraint"));
}
}
@@ -293,7 +293,7 @@
g_string_append (string, g_value_get_string (value));
else {
allok = FALSE;
- g_set_error (error, 0, 0, _("No referenced table specified in foreign key constraint"));
+ g_set_error (error, 0, 0, "%s", _("No referenced table specified in foreign key constraint"));
}
g_string_append (string, " (");
@@ -310,7 +310,7 @@
}
else {
allok = FALSE;
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Empty referenced field specified in foreign key constraint"));
}
}
@@ -358,7 +358,7 @@
if (!hasfields) {
allok = FALSE;
- g_set_error (error, 0, 0, _("Table to create must have at least one row"));
+ g_set_error (error, 0, 0, "%s", _("Table to create must have at least one row"));
}
if (allok) {
Modified: trunk/providers/postgres/gda-postgres-meta.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-meta.c (original)
+++ trunk/providers/postgres/gda-postgres-meta.c Thu Dec 11 19:58:57 2008
@@ -533,7 +533,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -567,7 +567,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
model = gda_connection_statement_execute_select (cnc, internal_stmt[I_STMT_EL_TYPES_COL], i_set,
@@ -693,7 +693,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -738,7 +738,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -860,7 +860,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -925,7 +925,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1192,7 +1192,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1222,7 +1222,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1257,7 +1257,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1287,7 +1287,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1329,7 +1329,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1389,7 +1389,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1453,7 +1453,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
@@ -1483,7 +1483,7 @@
return FALSE;
if (cdata->version_float < 8.2) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
- _("PostgreSQL version 8.2.0 at least is required"));
+ "%s", _("PostgreSQL version 8.2.0 at least is required"));
return FALSE;
}
Modified: trunk/providers/postgres/gda-postgres-provider.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-provider.c (original)
+++ trunk/providers/postgres/gda-postgres-provider.c Thu Dec 11 19:58:57 2008
@@ -1012,7 +1012,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous server operation"));
+ "%s", _("Provider does not support asynchronous server operation"));
return FALSE;
}
@@ -1141,7 +1141,7 @@
write_option = "READ ONLY";
else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,
- _("Transactions are not supported in read-only mode"));
+ "%s", _("Transactions are not supported in read-only mode"));
gda_connection_add_event_string (cnc, _("Transactions are not supported in read-only mode"));
return FALSE;
}
@@ -1152,13 +1152,13 @@
break;
case GDA_TRANSACTION_ISOLATION_READ_UNCOMMITTED:
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,
- _("Transactions are not supported in read uncommitted isolation level"));
+ "%s", _("Transactions are not supported in read uncommitted isolation level"));
gda_connection_add_event_string (cnc,
_("Transactions are not supported in read uncommitted isolation level"));
return FALSE;
case GDA_TRANSACTION_ISOLATION_REPEATABLE_READ:
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,
- _("Transactions are not supported in repeatable read isolation level"));
+ "%s", _("Transactions are not supported in repeatable read isolation level"));
gda_connection_add_event_string (cnc,
_("Transactions are not supported in repeatable read isolation level"));
return FALSE;
@@ -1177,7 +1177,7 @@
g_free (isolation_level);
if (!stmt) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Internal error"));
+ "%s", _("Internal error"));
return FALSE;
}
}
@@ -1275,7 +1275,7 @@
if (!stmt) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Internal error"));
+ "%s", _("Internal error"));
return FALSE;
}
@@ -1325,7 +1325,7 @@
if (!stmt) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Internal error"));
+ "%s", _("Internal error"));
return FALSE;
}
@@ -1375,7 +1375,7 @@
if (!stmt) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Internal error"));
+ "%s", _("Internal error"));
return FALSE;
}
@@ -1672,7 +1672,7 @@
}
else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- _("Unnamed parameter is not allowed in prepared statements"));
+ "%s", _("Unnamed parameter is not allowed in prepared statements"));
g_slist_foreach (param_ids, (GFunc) g_free, NULL);
g_slist_free (param_ids);
g_free (prep_stm_name);
@@ -1923,7 +1923,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous statement execution"));
+ "%s", _("Provider does not support asynchronous statement execution"));
return NULL;
}
@@ -2102,7 +2102,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, _("Cannot start transaction"));
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
- _("Cannot start transaction"));
+ "%s", _("Cannot start transaction"));
break;
}
@@ -2291,7 +2291,7 @@
g_free (str);
g_object_unref (params);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Could not set the XA transaction ID parameter"));
+ "%s", _("Could not set the XA transaction ID parameter"));
return FALSE;
}
g_free (str);
@@ -2327,7 +2327,7 @@
g_free (str);
g_object_unref (params);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Could not set the XA transaction ID parameter"));
+ "%s", _("Could not set the XA transaction ID parameter"));
return FALSE;
}
g_free (str);
@@ -2362,7 +2362,7 @@
g_free (str);
g_object_unref (params);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Could not set the XA transaction ID parameter"));
+ "%s", _("Could not set the XA transaction ID parameter"));
return FALSE;
}
g_free (str);
Modified: trunk/providers/postgres/gda-postgres-recordset.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-recordset.c (original)
+++ trunk/providers/postgres/gda-postgres-recordset.c Thu Dec 11 19:58:57 2008
@@ -428,7 +428,7 @@
if (!imodel->priv->pg_res) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Internal error"));
+ "%s", _("Internal error"));
return FALSE;
}
@@ -456,7 +456,7 @@
if (!imodel->priv->pg_res) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
- _("Internal error"));
+ "%s", _("Internal error"));
return FALSE;
}
Modified: trunk/providers/postgres/gda-postgres-util.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-util.c (original)
+++ trunk/providers/postgres/gda-postgres-util.c Thu Dec 11 19:58:57 2008
@@ -79,14 +79,14 @@
gda_connection_event_set_description (error_ev, ptr);
gda_connection_event_set_gda_code (error_ev, gda_code);
- g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR, ptr);
+ g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR, "%s", ptr);
g_free (message);
}
else {
gda_connection_event_set_description (error_ev, _("No detail"));
gda_connection_event_set_gda_code (error_ev, gda_code);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
- _("No detail"));
+ "%s", _("No detail"));
}
gda_connection_event_set_code (error_ev, -1);
Modified: trunk/providers/skel-implementation/capi/gda-capi-ddl.c
==============================================================================
--- trunk/providers/skel-implementation/capi/gda-capi-ddl.c (original)
+++ trunk/providers/skel-implementation/capi/gda-capi-ddl.c Thu Dec 11 19:58:57 2008
@@ -133,7 +133,7 @@
if (!hasfields) {
allok = FALSE;
- g_set_error (error, 0, 0, _("Table to create must have at least one row"));
+ g_set_error (error, 0, 0, "%s", _("Table to create must have at least one row"));
}
g_slist_free (pkfields);
Modified: trunk/providers/skel-implementation/capi/gda-capi-provider.c
==============================================================================
--- trunk/providers/skel-implementation/capi/gda-capi-provider.c (original)
+++ trunk/providers/skel-implementation/capi/gda-capi-provider.c Thu Dec 11 19:58:57 2008
@@ -591,7 +591,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous server operation"));
+ "%s", _("Provider does not support asynchronous server operation"));
return FALSE;
}
@@ -946,7 +946,7 @@
}
else {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
- _("Unnamed parameter is not allowed in prepared statements"));
+ "%s", _("Unnamed parameter is not allowed in prepared statements"));
g_slist_foreach (param_ids, (GFunc) g_free, NULL);
g_slist_free (param_ids);
goto out;
@@ -1007,7 +1007,7 @@
/* If asynchronous connection opening is not supported, then exit now */
if (async_cb) {
g_set_error (error, GDA_SERVER_PROVIDER_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
- _("Provider does not support asynchronous statement execution"));
+ "%s", _("Provider does not support asynchronous statement execution"));
return NULL;
}
@@ -1068,7 +1068,7 @@
gda_connection_event_set_description (event, _("Missing parameter(s) to execute query"));
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
- _("Missing parameter(s) to execute query"));
+ "%s", _("Missing parameter(s) to execute query"));
break;
}
@@ -1087,7 +1087,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, "%s", str);
g_free (str);
break;
}
@@ -1106,7 +1106,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
g_free (str);
break;
}
Modified: trunk/tests/data-models/check_data_proxy.c
==============================================================================
--- trunk/tests/data-models/check_data_proxy.c (original)
+++ trunk/tests/data-models/check_data_proxy.c Thu Dec 11 19:58:57 2008
@@ -153,7 +153,7 @@
if (pop < 100) {
GError *error = NULL;
g_set_error (&error, 0, 0,
- "Population is too small");
+ "%s", "Population is too small");
return error;
}
else
Modified: trunk/tests/data-models/check_empty_rs.c
==============================================================================
--- trunk/tests/data-models/check_empty_rs.c (original)
+++ trunk/tests/data-models/check_empty_rs.c Thu Dec 11 19:58:57 2008
@@ -74,7 +74,7 @@
g_print ("Missing test data!\n SQL: %s\n SER: %s\n", sql, tsql);
else if (strcmp (tsql, empty_rs_serial)) {
g_print ("Test failed!\n SQL: %s\n EXP: %s\n GOT: %s\n", sql, empty_rs_serial, tsql);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Failed serialized comparison");
g_free (tsql);
goto out;
Modified: trunk/tests/data-models/check_pmodel.c
==============================================================================
--- trunk/tests/data-models/check_pmodel.c (original)
+++ trunk/tests/data-models/check_pmodel.c Thu Dec 11 19:58:57 2008
@@ -1962,7 +1962,7 @@
gda_data_model_dump (rerun, stdout);
if (error) {
g_set_error (error, 0, -1,
- "There are some differences when re-running the SELECT statement...");
+ "%s", "There are some differences when re-running the SELECT statement...");
}
}
g_object_unref (cmp);
@@ -2318,7 +2318,7 @@
gda_data_model_dump (model2, stdout);
#endif
g_set_error (&lerror, 0, 0,
- "There are some differences when comparing data models...");
+ "%s", "There are some differences when comparing data models...");
goto onerror;
}
g_object_unref (cmp);
Modified: trunk/tests/gda-ddl-creator.c
==============================================================================
--- trunk/tests/gda-ddl-creator.c (original)
+++ trunk/tests/gda-ddl-creator.c Thu Dec 11 19:58:57 2008
@@ -683,7 +683,7 @@
g_return_val_if_fail (ddlc->priv, NULL);
if (!ddlc->priv->cnc) {
g_set_error (error, GDA_DDL_CREATOR_ERROR, GDA_DDL_CREATOR_NO_CONNECTION_ERROR,
- _("No connection specified"));
+ "%s", _("No connection specified"));
return NULL;
}
@@ -736,12 +736,12 @@
g_return_val_if_fail (ddlc->priv, FALSE);
if (!ddlc->priv->cnc) {
g_set_error (error, GDA_DDL_CREATOR_ERROR, GDA_DDL_CREATOR_NO_CONNECTION_ERROR,
- _("No connection specified"));
+ "%s", _("No connection specified"));
return FALSE;
}
if (!ddlc->priv->d_mstruct) {
g_set_error (error, GDA_DDL_CREATOR_ERROR, GDA_DDL_CREATOR_NO_CONNECTION_ERROR,
- _("No destination database objects specified"));
+ "%s", _("No destination database objects specified"));
return FALSE;
}
Modified: trunk/tests/multi-threading/common.c
==============================================================================
--- trunk/tests/multi-threading/common.c (original)
+++ trunk/tests/multi-threading/common.c Thu Dec 11 19:58:57 2008
@@ -17,7 +17,7 @@
/* create batch */
prov = gda_config_get_provider ("SQLite", NULL);
if (!prov) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Cannot find the SQLite provider");
return FALSE;
}
Modified: trunk/tests/test-cnc-utils.c
==============================================================================
--- trunk/tests/test-cnc-utils.c (original)
+++ trunk/tests/test-cnc-utils.c Thu Dec 11 19:58:57 2008
@@ -424,7 +424,7 @@
}
if (list || (j < ncols)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Incoherent number of columns in table and imported data");
gda_connection_rollback_transaction (cnc, NULL, NULL);
retval = FALSE;
Modified: trunk/tests/value-holders/check_holder.c
==============================================================================
--- trunk/tests/value-holders/check_holder.c (original)
+++ trunk/tests/value-holders/check_holder.c Thu Dec 11 19:58:57 2008
@@ -90,7 +90,7 @@
emitted_signals_monitor_holder (h);
cvalue = gda_holder_get_value (h);
if (!gda_value_is_null (cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Expecting NULL value from new GdaHolder");
return FALSE;
}
@@ -107,7 +107,7 @@
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -126,7 +126,7 @@
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (copy, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -150,13 +150,13 @@
value = gda_value_new_from_string ("TRUE", G_TYPE_BOOLEAN);
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
gda_value_free (value);
if (strcmp (gda_holder_get_id (h), "ABOOL")) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's ID is incorrect");
return FALSE;
}
@@ -167,13 +167,13 @@
value = gda_value_new_from_string ("A string value", G_TYPE_STRING);
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
gda_value_free (value);
if (strcmp (gda_holder_get_id (h), "Astring")) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's ID is incorrect");
return FALSE;
}
@@ -183,13 +183,13 @@
value = gda_value_new_from_string ("15", G_TYPE_INT);
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
gda_value_free (value);
if (strcmp (gda_holder_get_id (h), "AnInt")) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's ID is incorrect");
return FALSE;
}
@@ -212,7 +212,7 @@
h = gda_holder_new_boolean ("ABOOL", TRUE);
emitted_signals_monitor_holder (h);
if (!gda_holder_is_valid (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder is invalid");
return FALSE;
}
@@ -220,13 +220,13 @@
/***/
gda_holder_force_invalid (h);
if (gda_holder_is_valid (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder is valid");
return FALSE;
}
cvalue = gda_holder_get_value (h);
if (!gda_value_is_null (cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -237,7 +237,7 @@
if (! gda_holder_take_value (h, value, error))
return FALSE;
if (!gda_holder_is_valid (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder is invalid");
return FALSE;
}
@@ -267,14 +267,14 @@
cvalue = gda_holder_get_default_value (h);
if (cvalue) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder should not have a default value");
return FALSE;
}
/***/
if (gda_holder_set_value_to_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Should not set GdaHolder's value to default");
return FALSE;
}
@@ -289,7 +289,7 @@
cvalue = gda_holder_get_default_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's default value is invalid");
return FALSE;
}
@@ -297,14 +297,14 @@
/***/
if (gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should not be default");
return FALSE;
}
/** Check value */
if (! gda_holder_set_value_to_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Could not set GdaHolder's value to default");
return FALSE;
}
@@ -316,7 +316,7 @@
cvalue = gda_holder_get_value (h);
if (cvalue) {
tests_common_display_value ("cvalue", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is invalid");
return FALSE;
}
@@ -333,7 +333,7 @@
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
tests_common_display_value ("cvalue", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is invalid");
return FALSE;
}
@@ -347,7 +347,7 @@
cvalue = gda_holder_get_default_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's default value is invalid");
return FALSE;
}
@@ -355,7 +355,7 @@
/***/
if (gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should not be default");
return FALSE;
}
@@ -381,7 +381,7 @@
cvalue = gda_holder_get_default_value (h);
if (cvalue) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder should not have a default value");
return FALSE;
}
@@ -394,21 +394,21 @@
cvalue = gda_holder_get_default_value (h);
if (!cvalue || gda_value_compare (defvalue, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's default value is invalid");
return FALSE;
}
/***/
if (gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should not be default");
return FALSE;
}
/** Check value */
if (! gda_holder_set_value_to_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Could not set GdaHolder's value to default");
return FALSE;
}
@@ -420,7 +420,7 @@
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (defvalue, cvalue)) {
tests_common_display_value ("cvalue", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is invalid");
return FALSE;
}
@@ -437,7 +437,7 @@
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
tests_common_display_value ("cvalue", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is invalid");
return FALSE;
}
@@ -445,7 +445,7 @@
/***/
if (gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should not be default");
return FALSE;
}
@@ -462,7 +462,7 @@
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
tests_common_display_value ("cvalue", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is invalid");
return FALSE;
}
@@ -470,7 +470,7 @@
/***/
if (!gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should be default");
return FALSE;
}
@@ -496,7 +496,7 @@
emitted_signals_monitor_holder (h);
emitted_signals_reset ();
if (cvalue) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder should not have a default value");
return FALSE;
}
@@ -509,21 +509,21 @@
cvalue = gda_holder_get_default_value (h);
if (!cvalue || gda_value_compare (defvalue, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's default value is invalid");
return FALSE;
}
/***/
if (gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should not be default");
return FALSE;
}
/** Check value */
if (! gda_holder_set_value_to_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Could not set GdaHolder's value to default");
return FALSE;
}
@@ -535,7 +535,7 @@
cvalue = gda_holder_get_value (h);
if (cvalue) {
tests_common_display_value ("cvalue", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is invalid");
return FALSE;
}
@@ -547,7 +547,7 @@
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_compare (value, cvalue)) {
tests_common_display_value ("cvalue", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is invalid");
return FALSE;
}
@@ -555,7 +555,7 @@
/***/
if (gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should not be default");
return FALSE;
}
@@ -595,7 +595,7 @@
cvalue = gda_holder_get_value (h1);
if (!cvalue || gda_value_compare (value, cvalue)) {
tests_common_display_value ("Slave", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Slave GdaHolder's value is wrong");
return FALSE;
}
@@ -615,7 +615,7 @@
cvalue = gda_holder_get_value (h1);
if (!cvalue || gda_value_compare (value, cvalue)) {
tests_common_display_value ("Slave", cvalue);
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Slave GdaHolder's value is wrong");
return FALSE;
}
@@ -634,13 +634,13 @@
cvalue = gda_holder_get_value (h2);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Master GdaHolder's value is wrong");
return FALSE;
}
cvalue = gda_holder_get_value (h1);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Slave GdaHolder's value is wrong");
return FALSE;
}
@@ -653,7 +653,7 @@
cvalue = gda_holder_get_value (h1);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Slave GdaHolder's value is wrong");
return FALSE;
}
@@ -671,14 +671,14 @@
cvalue = gda_holder_get_value (h1);
if (!cvalue || gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Slave GdaHolder's value is wrong");
return FALSE;
}
cvalue = gda_holder_get_value (h2);
if (!cvalue || !gda_value_compare (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Master GdaHolder's value is wrong");
return FALSE;
}
@@ -715,7 +715,7 @@
/***/
if (!gda_holder_value_is_default (h)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value should be default");
return FALSE;
}
@@ -749,7 +749,7 @@
return FALSE;
if ((gda_holder_get_source_model (h, &col) != model) || (col != 1)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's source is wrong");
return FALSE;
}
@@ -762,7 +762,7 @@
if (!emitted_signals_chech_empty (NULL, "source-changed", error))
return FALSE;
if ((gda_holder_get_source_model (h, &col) != model) || (col != 0)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's source is wrong");
return FALSE;
}
@@ -776,7 +776,7 @@
return FALSE;
if (gda_holder_get_source_model (h, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's source should be NULL");
return FALSE;
}
@@ -805,7 +805,7 @@
GError *error = NULL;
g_print ("GdaHolder change refused\n");
g_set_error (&error, 0, 0,
- "GdaHolder change refused!");
+ "%s", "GdaHolder change refused!");
return error;
}
}
@@ -839,7 +839,7 @@
value = gda_value_new_from_string ("my other string", G_TYPE_STRING);
emitted_signals_reset ();
if (gda_holder_set_value (h, value, error)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's change should have failed");
return FALSE;
}
@@ -851,7 +851,7 @@
value = gda_value_new_from_string ("my string", G_TYPE_STRING);
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_differ (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -871,7 +871,7 @@
/***/
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_differ (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -896,7 +896,7 @@
value = gda_value_new_from_string ("my string", G_TYPE_STRING);
emitted_signals_reset ();
if (gda_holder_set_value (h, value, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's change should have failed");
return FALSE;
}
@@ -924,7 +924,7 @@
/***/
cvalue = gda_holder_get_value (h);
if (!cvalue || gda_value_differ (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -947,7 +947,7 @@
/***/
value = gda_value_new_from_string ("my string", G_TYPE_STRING);
if (gda_holder_get_attribute (h, "attname1")) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_get_attribute() should have retunred NULL");
return FALSE;
}
@@ -955,13 +955,13 @@
gda_value_free (value);
cvalue = gda_holder_get_attribute (h, "attname1");
if (!cvalue) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_get_attribute() should have retunred a value");
return FALSE;
}
value = gda_value_new_from_string ("my string", G_TYPE_STRING);
if (gda_value_differ (cvalue, value)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_get_attribute() retunred a wrong value");
return FALSE;
}
@@ -974,12 +974,12 @@
copy = gda_holder_copy (h);
cvalue = gda_holder_get_attribute (copy, "attname1");
if (!cvalue) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_get_attribute() should have retunred a value");
return FALSE;
}
if (gda_value_differ (cvalue, value)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_get_attribute() retunred a wrong value");
return FALSE;
}
@@ -987,7 +987,7 @@
g_object_get (G_OBJECT (copy), "name", &name, NULL);
if (strcmp (name, "thename")) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_copy() did not copy the name");
return FALSE;
}
Modified: trunk/tests/value-holders/check_set.c
==============================================================================
--- trunk/tests/value-holders/check_set.c (original)
+++ trunk/tests/value-holders/check_set.c Thu Dec 11 19:58:57 2008
@@ -115,7 +115,7 @@
h = gda_set_get_holder (set, "H1");
if (!h) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Could not find GdaHolder H1");
return FALSE;
}
@@ -174,7 +174,7 @@
GError *error = NULL;
g_print ("GdaHolder change refused\n");
g_set_error (&error, 0, 0,
- "GdaHolder change refused!");
+ "%s", "GdaHolder change refused!");
return error;
}
}
@@ -203,13 +203,13 @@
h = gda_set_get_holder (set, "H2");
g_value_set_int ((value = gda_value_new (G_TYPE_INT)), 333);
if (gda_holder_set_value (h, value, &lerror)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_set_value() should have been refused and failed");
return FALSE;
}
gda_value_free (value);
if (!lerror) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Returned GError should not be NULL");
return FALSE;
}
@@ -226,7 +226,7 @@
g_value_set_int ((value = gda_value_new (G_TYPE_INT)), 1234);
cvalue = gda_set_get_holder_value (set, "H2");
if (!cvalue || gda_value_differ (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -239,7 +239,7 @@
/***/cvalue = gda_set_get_holder_value (set, "H2");
if (!cvalue || gda_value_differ (value, cvalue)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"GdaHolder's value is incorrect");
return FALSE;
}
@@ -270,7 +270,7 @@
h = gda_set_get_holder (set, "H1");
if (!h) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Could not find GdaHolder H1");
return FALSE;
}
@@ -313,7 +313,7 @@
GError *error = NULL;
g_print ("GdaSet change refused\n");
g_set_error (&error, 0, 0,
- "GdaSet change refused!");
+ "%s", "GdaSet change refused!");
return error;
}
}
@@ -335,13 +335,13 @@
G_CALLBACK (t5_validate_change), "MyToken2");
if (gda_set_is_valid (set, &lerror)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_set_is_valid() should have returned FALSE");
return FALSE;
}
if (!lerror) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"Returned GError should not be NULL");
return FALSE;
}
@@ -358,7 +358,7 @@
h = gda_set_get_holder (set, "H2");
g_value_set_int ((value = gda_value_new (G_TYPE_INT)), 125);
if (!gda_holder_set_value (h, value, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_set_value() should not have failed");
return FALSE;
}
@@ -367,7 +367,7 @@
h = gda_set_get_holder (set, "H3");
g_value_set_char ((value = gda_value_new (G_TYPE_CHAR)), 'd');
if (!gda_holder_set_value (h, value, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
"gda_holder_set_value() should not have failed");
return FALSE;
}
Modified: trunk/tools/command-exec.c
==============================================================================
--- trunk/tools/command-exec.c (original)
+++ trunk/tools/command-exec.c Thu Dec 11 19:58:57 2008
@@ -356,19 +356,19 @@
g_strfreev (args);
args = NULL;
if (!command) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Unknown internal command"));
goto cleanup;
}
if (!command->command_func) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Internal command not correctly defined"));
goto cleanup;
}
if (!command_complete) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Incomplete internal command"));
goto cleanup;
}
@@ -478,7 +478,7 @@
GdaInternalCommandResult *res;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -500,7 +500,7 @@
GdaDataModel *model;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -543,7 +543,7 @@
GdaDataModel *model;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -585,7 +585,7 @@
GdaDataModel *model;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -682,7 +682,7 @@
objlist = gda_meta_struct_get_all_db_objects (mstruct);
if (!objlist) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No object found"));
goto onerror;
}
@@ -718,7 +718,7 @@
GdaDataModel *model;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -808,7 +808,7 @@
return res;
}
else if (nb_objects == 0) {
- g_set_error (error, 0, 0, _("No object found"));
+ g_set_error (error, 0, 0, "%s", _("No object found"));
g_slist_free (tmplist);
return NULL;
}
Modified: trunk/tools/gda-sql.c
==============================================================================
--- trunk/tools/gda-sql.c (original)
+++ trunk/tools/gda-sql.c Thu Dec 11 19:58:57 2008
@@ -663,12 +663,12 @@
}
else {
if (!data->current) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No connection specified"));
return NULL;
}
if (!gda_connection_is_opened (data->current->cnc)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Connection closed"));
return NULL;
}
@@ -708,7 +708,7 @@
}
if (stmt_list->next) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("More than one SQL statement"));
g_object_unref (batch);
return NULL;
@@ -2187,7 +2187,7 @@
gchar *real_cnc, *real_provider, *user, *pass;
if (!args[0] || !args[1]) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing arguments"));
return NULL;
}
@@ -2208,7 +2208,7 @@
newdsn.is_system = FALSE;
if (!newdsn.provider) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing provider name"));
}
else if (gda_config_define_dsn (&newdsn, error)) {
@@ -2231,7 +2231,7 @@
gint i;
if (!args[0]) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing DSN name"));
return NULL;
}
@@ -2419,7 +2419,7 @@
}
}
else if (!data->current) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No current connection"));
return NULL;
}
@@ -2586,7 +2586,7 @@
else {
/* close current connection */
if (! data->current) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No currently opened connection"));
return NULL;
}
@@ -2619,7 +2619,7 @@
GString *string;
if (nargs < 3) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing required connection names"));
return NULL;
}
@@ -2652,7 +2652,7 @@
virtual = gda_virtual_connection_open (vprovider, NULL);
if (!virtual) {
- g_set_error (error, 0, 0, _("Could not create virtual connection"));
+ g_set_error (error, 0, 0, "%s", _("Could not create virtual connection"));
return NULL;
}
@@ -2787,7 +2787,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
goto end_of_command;
}
@@ -2881,7 +2881,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
@@ -2915,7 +2915,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
@@ -2935,7 +2935,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
@@ -2967,14 +2967,14 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
if (!data->current->query_buffer)
data->current->query_buffer = g_string_new ("");
if (!args[0])
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing FILE to write to"));
else {
if (g_file_set_contents (args[0], data->current->query_buffer->str, -1, error)) {
@@ -3009,7 +3009,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
@@ -3017,7 +3017,7 @@
GdaMetaStore *mstore;
mstore = gda_connection_get_meta_store (data->current->cnc);
if (!gda_meta_store_schema_add_custom_object (mstore, QUERY_BUFFERS_TABLE_DESC, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Can't initialize dictionary to store query buffers"));
return NULL;
}
@@ -3053,7 +3053,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
@@ -3065,7 +3065,7 @@
if (args[0] && *args[0])
qname = g_strdup ((gchar *) args[0]);
else {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing query buffer name"));
return NULL;
}
@@ -3074,7 +3074,7 @@
GdaMetaStore *mstore;
mstore = gda_connection_get_meta_store (data->current->cnc);
if (!gda_meta_store_schema_add_custom_object (mstore, QUERY_BUFFERS_TABLE_DESC, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Can't initialize dictionary to store query buffers"));
g_free (qname);
return NULL;
@@ -3106,7 +3106,7 @@
res->type = GDA_INTERNAL_COMMAND_RESULT_EMPTY;
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Query buffer is empty"));
return res;
@@ -3119,7 +3119,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
@@ -3131,7 +3131,7 @@
GdaMetaStore *mstore;
mstore = gda_connection_get_meta_store (data->current->cnc);
if (!gda_meta_store_schema_add_custom_object (mstore, QUERY_BUFFERS_TABLE_DESC, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Can't initialize dictionary to store query buffers"));
return NULL;
}
@@ -3169,7 +3169,7 @@
g_object_unref (model);
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing query buffer name"));
return res;
@@ -3182,7 +3182,7 @@
GdaInternalCommandResult *res = NULL;
if (!data->current) {
- g_set_error (error, 0, 0, _("No connection opened"));
+ g_set_error (error, 0, 0, "%s", _("No connection opened"));
return NULL;
}
@@ -3194,7 +3194,7 @@
GdaMetaStore *mstore;
mstore = gda_connection_get_meta_store (data->current->cnc);
if (!gda_meta_store_schema_add_custom_object (mstore, QUERY_BUFFERS_TABLE_DESC, NULL)) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Can't initialize dictionary to store query buffers"));
return NULL;
}
@@ -3221,7 +3221,7 @@
res->type = GDA_INTERNAL_COMMAND_RESULT_EMPTY;
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing query buffer name"));
return res;
@@ -3358,7 +3358,7 @@
return NULL;
}
if (remain) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Wrong row condition"));
g_free (sql);
return NULL;
@@ -3386,7 +3386,7 @@
gda_internal_command_exec_result_free (tmpres);
if (!retval && !errorset)
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("No unique row identified"));
return retval;
@@ -3405,7 +3405,7 @@
gint whichargs = 0;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -3418,7 +3418,7 @@
if (args[3] && *args[3]) {
row_cond = args[3];
if (args [4]) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Too many arguments"));
return NULL;
}
@@ -3466,7 +3466,7 @@
res->type = GDA_INTERNAL_COMMAND_RESULT_EMPTY;
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Wrong number of arguments"));
return res;
@@ -3486,7 +3486,7 @@
gint whichargs = 0;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -3501,7 +3501,7 @@
if (args[3] && *args[3]) {
filename = args[3];
if (args [4]) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Too many arguments"));
return NULL;
}
@@ -3529,7 +3529,7 @@
value = gda_holder_get_value (param);
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Wrong number of arguments"));
if (value) {
@@ -3541,7 +3541,7 @@
GdaBlob *tblob = (GdaBlob*) gda_value_get_blob (vblob);
const GdaBlob *fblob = gda_value_get_blob (value);
if (gda_blob_op_write (tblob->op, (GdaBlob*) fblob, 0) < 0)
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Could not write file"));
else
done = TRUE;
@@ -3555,7 +3555,7 @@
((GdaBinary *) fblob)->data = fbin->data;
((GdaBinary *) fblob)->binary_length = fbin->binary_length;
if (gda_blob_op_write (tblob->op, (GdaBlob*) fblob, 0) < 0)
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Could not write file"));
else
done = TRUE;
@@ -3702,7 +3702,7 @@
GdaMetaStruct *mstruct;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -3750,7 +3750,7 @@
if (port > 0) {
data->server = web_server_new (port);
if (!data->server)
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Could not start HTTPD server"));
else {
res = g_new0 (GdaInternalCommandResult, 1);
@@ -3759,7 +3759,7 @@
}
}
else
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Invalid port specification"));
}
@@ -3780,7 +3780,7 @@
const gchar *row_cond = NULL;
if (!cnc) {
- g_set_error (error, 0, 0, _("No current connection"));
+ g_set_error (error, 0, 0, "%s", _("No current connection"));
return NULL;
}
@@ -3802,7 +3802,7 @@
}
}
if (!row_cond) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Missing arguments"));
return NULL;
}
@@ -3836,7 +3836,7 @@
if (!stmt)
return NULL;
if (remain) {
- g_set_error (error, 0, 0,
+ g_set_error (error, 0, 0, "%s",
_("Wrong row condition"));
return NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
