]>
Commit | Line | Data |
---|---|---|
5efe86bf JB |
1 | --- libgda-3.1.5/libgda/sqlite/virtual/gda-vconnection-data-model.c~ 2008-07-20 11:51:22.000000000 +0200 |
2 | +++ libgda-3.1.5/libgda/sqlite/virtual/gda-vconnection-data-model.c 2013-11-30 22:15:05.063893169 +0100 | |
00eee7f2 JR |
3 | @@ -242,7 +242,7 @@ |
4 | rc = sqlite3_exec (scnc->connection, str, NULL, 0, &zErrMsg); | |
5 | g_free (str); | |
6 | if (rc != SQLITE_OK) { | |
7 | - g_set_error (error, 0, 0, g_strdup (zErrMsg)); | |
8 | + g_set_error (error, 0, 0, "%s", g_strdup (zErrMsg)); | |
9 | sqlite3_free (zErrMsg); | |
10 | gda_vconnection_data_model_table_data_free (td); | |
11 | cnc->priv->table_data_list = g_slist_remove (cnc->priv->table_data_list, td); | |
12 | @@ -303,7 +303,7 @@ | |
13 | g_free (str); | |
14 | ||
15 | if (rc != SQLITE_OK) { | |
16 | - g_set_error (error, 0, 0, g_strdup (zErrMsg)); | |
17 | + g_set_error (error, 0, 0, "%s", g_strdup (zErrMsg)); | |
18 | sqlite3_free (zErrMsg); | |
19 | return FALSE; | |
20 | } | |
5efe86bf JB |
21 | --- libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c~ 2013-11-30 22:13:45.023125651 +0100 |
22 | +++ libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c 2013-11-30 22:16:40.384890339 +0100 | |
00eee7f2 JR |
23 | @@ -1032,7 +1032,7 @@ |
24 | g_free (filename); | |
25 | ||
26 | if (errmsg != SQLITE_OK) { | |
27 | - g_set_error (error, 0, 0, sqlite3_errmsg (scnc->connection)); | |
28 | + g_set_error (error, 0, 0, "%s", sqlite3_errmsg (scnc->connection)); | |
29 | retval = FALSE; | |
30 | } | |
31 | gda_sqlite_free_cnc (scnc); | |
32 | @@ -1058,7 +1058,7 @@ | |
33 | g_free (tmp); | |
34 | ||
35 | if (g_unlink (filename)) { | |
36 | - g_set_error (error, 0, 0, | |
37 | + g_set_error (error, 0, 0, "%s", | |
38 | sys_errlist [errno]); | |
39 | retval = FALSE; | |
40 | } | |
5efe86bf JB |
41 | --- libgda-3.1.5/libgda/sql-delimiter/gda-sql-delimiter.c~ 2008-07-20 11:51:22.000000000 +0200 |
42 | +++ libgda-3.1.5/libgda/sql-delimiter/gda-sql-delimiter.c 2013-11-30 22:17:32.765454196 +0100 | |
00eee7f2 JR |
43 | @@ -60,7 +60,7 @@ |
44 | g_set_error (gda_sql_error, 0, 0, _("Parse error near `%s'"), gda_delimitertext); | |
45 | else if (!strcmp (string, "syntax error")) | |
46 | g_set_error (gda_sql_error, 0, 0, _("Syntax error near `%s'"), gda_delimitertext); | |
47 | - else g_set_error (gda_sql_error, 0, 0, string); | |
48 | + else g_set_error (gda_sql_error, 0, 0, "%s", string); | |
49 | } | |
50 | } | |
51 | else | |
5efe86bf JB |
52 | --- libgda-3.1.5/libgda/gda-connection.c~ 2008-07-20 11:51:23.000000000 +0200 |
53 | +++ libgda-3.1.5/libgda/gda-connection.c 2013-11-30 22:18:40.019508054 +0100 | |
00eee7f2 JR |
54 | @@ -540,7 +540,7 @@ |
55 | event = GDA_CONNECTION_EVENT (l->data); | |
56 | if (gda_connection_event_get_event_type (event) == GDA_CONNECTION_EVENT_ERROR) { | |
57 | if (error && !(*error)) | |
58 | - g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_OPEN_ERROR, | |
59 | + g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_OPEN_ERROR, "%s", | |
60 | gda_connection_event_get_description (event)); | |
61 | gda_client_notify_error_event (cnc->priv->client, cnc, | |
62 | GDA_CONNECTION_EVENT (l->data)); | |
63 | @@ -1200,7 +1200,7 @@ | |
64 | while (events && !has_error) { | |
65 | if (gda_connection_event_get_event_type (GDA_CONNECTION_EVENT (events->data)) == | |
66 | GDA_CONNECTION_EVENT_ERROR) { | |
67 | - g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_EXECUTE_COMMAND_ERROR, | |
68 | + g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_EXECUTE_COMMAND_ERROR, "%s", | |
69 | gda_connection_event_get_description (GDA_CONNECTION_EVENT (events->data))); | |
70 | has_error = TRUE; | |
71 | } | |
5efe86bf JB |
72 | --- libgda-3.1.5/libgda/gda-data-model-bdb.c~ 2008-07-20 11:51:23.000000000 +0200 |
73 | +++ libgda-3.1.5/libgda/gda-data-model-bdb.c 2013-11-30 22:19:02.359746578 +0100 | |
00eee7f2 JR |
74 | @@ -216,7 +216,7 @@ |
75 | { | |
76 | GError *error = NULL; | |
77 | ||
78 | - g_set_error (&error, 0, 0, err); | |
79 | + g_set_error (&error, 0, 0, "%s", err); | |
80 | g_print ("ADD_ERROR (%s)\n", err); | |
81 | model->priv->errors = g_slist_append (model->priv->errors, error); | |
82 | } | |
5efe86bf JB |
83 | --- libgda-3.1.5/libgda/gda-data-model-dir.c~ 2013-11-30 22:13:45.019792285 +0100 |
84 | +++ libgda-3.1.5/libgda/gda-data-model-dir.c 2013-11-30 22:21:11.304449215 +0100 | |
00eee7f2 JR |
85 | @@ -250,7 +250,7 @@ |
86 | { | |
87 | GError *error = NULL; | |
88 | ||
89 | - g_set_error (&error, 0, 0, err); | |
90 | + g_set_error (&error, 0, 0, "%s", err); | |
91 | g_print ("ADD_ERROR (%s)\n", err); | |
92 | model->priv->errors = g_slist_append (model->priv->errors, error); | |
93 | } | |
94 | @@ -929,7 +929,7 @@ | |
95 | str = g_strdup_printf (_("Row %d out of range 0 - %d"), row, | |
96 | imodel->priv->rows->len - 1); | |
97 | add_error (imodel, str); | |
98 | - g_set_error (error, 0, 0, str); | |
99 | + g_set_error (error, 0, 0, "%s", str); | |
100 | g_free (str); | |
101 | return FALSE; | |
102 | } | |
103 | @@ -1006,7 +1006,7 @@ | |
104 | str = g_strdup_printf (_("Could not rename file '%s' to '%s'"), | |
105 | filename, new_filename); | |
106 | add_error (imodel, str); | |
107 | - g_set_error (error, 0, 0, str); | |
108 | + g_set_error (error, 0, 0, "%s", str); | |
109 | g_free (str); | |
110 | g_free (new_filename); | |
111 | g_free (filename); | |
112 | @@ -1029,7 +1029,7 @@ | |
113 | gchar *str; | |
114 | str = g_strdup_printf (_("Could not create directory '%s'"), new_path); | |
115 | add_error (imodel, str); | |
116 | - g_set_error (error, 0, 0, str); | |
117 | + g_set_error (error, 0, 0, "%s", str); | |
118 | g_free (str); | |
119 | g_free (old_path); | |
120 | return FALSE; | |
121 | @@ -1049,7 +1049,7 @@ | |
122 | gchar *str; | |
123 | str = g_strdup_printf (_("Could not rename file '%s' to '%s'"), filename, new_filename); | |
124 | add_error (imodel, str); | |
125 | - g_set_error (error, 0, 0, str); | |
126 | + g_set_error (error, 0, 0, "%s", str); | |
127 | g_free (str); | |
128 | g_free (new_filename); | |
129 | g_free (filename); | |
130 | @@ -1098,7 +1098,7 @@ | |
131 | gchar *str; | |
132 | str = g_strdup_printf (_("Could not overwrite contents of file '%s'"), filename); | |
133 | add_error (imodel, str); | |
134 | - g_set_error (error, 0, 0, str); | |
135 | + g_set_error (error, 0, 0, "%s", str); | |
136 | g_free (str); | |
137 | g_object_unref (op); | |
138 | g_free (filename); | |
139 | @@ -1230,7 +1230,7 @@ | |
140 | gchar *str; | |
141 | str = g_strdup_printf (_("Cannot set contents of filename '%s'"), complete_filename); | |
142 | add_error (imodel, str); | |
143 | - g_set_error (error, 0, 0, str); | |
144 | + g_set_error (error, 0, 0, "%s", str); | |
145 | g_free (str); | |
146 | if (bin_to_free) | |
147 | g_free (bin_data); | |
148 | @@ -1241,7 +1241,7 @@ | |
149 | gchar *str; | |
150 | str = g_strdup_printf (_("Cannot create directory '%s'"), dirname); | |
151 | add_error (imodel, str); | |
152 | - g_set_error (error, 0, 0, str); | |
153 | + g_set_error (error, 0, 0, "%s", str); | |
154 | g_free (str); | |
155 | return -1; | |
156 | } | |
157 | @@ -1272,7 +1272,7 @@ | |
158 | str = g_strdup_printf (_("Row %d out of range 0 - %d"), row, | |
159 | imodel->priv->rows->len - 1); | |
160 | add_error (imodel, str); | |
161 | - g_set_error (error, 0, 0, str); | |
162 | + g_set_error (error, 0, 0, "%s", str); | |
163 | g_free (str); | |
164 | return FALSE; | |
165 | } | |
166 | @@ -1288,7 +1288,7 @@ | |
167 | gchar *str; | |
168 | str = g_strdup_printf (_("Cannot remove file '%s'"), filename); | |
169 | add_error (imodel, str); | |
170 | - g_set_error (error, 0, 0, str); | |
171 | + g_set_error (error, 0, 0, "%s", str); | |
172 | g_free (str); | |
173 | g_free (filename); | |
174 | return FALSE; | |
5efe86bf JB |
175 | --- libgda-3.1.5/libgda/gda-data-model-import.c~ 2008-07-20 11:51:23.000000000 +0200 |
176 | +++ libgda-3.1.5/libgda/gda-data-model-import.c 2013-11-30 22:21:33.504683758 +0100 | |
00eee7f2 JR |
177 | @@ -1734,7 +1734,7 @@ |
178 | { | |
179 | GError *error = NULL; | |
180 | ||
181 | - g_set_error (&error, 0, 0, err); | |
182 | + g_set_error (&error, 0, 0, "%s", err); | |
183 | model->priv->errors = g_slist_append (model->priv->errors, error); | |
184 | } | |
185 | ||
5efe86bf JB |
186 | --- libgda-3.1.5/libgda/gda-parameter-list.c~ 2008-07-20 11:51:23.000000000 +0200 |
187 | +++ libgda-3.1.5/libgda/gda-parameter-list.c 2013-11-30 22:22:53.398858452 +0100 | |
00eee7f2 JR |
188 | @@ -579,7 +579,7 @@ |
189 | errors = gda_data_model_import_get_errors (GDA_DATA_MODEL_IMPORT (model)); | |
190 | if (errors) { | |
191 | GError *err = (GError *) errors->data; | |
192 | - g_set_error (error, 0, 0, err->message); | |
193 | + g_set_error (error, 0, 0, "%s", err->message); | |
194 | g_object_unref (model); | |
195 | model = NULL; | |
196 | allok = FALSE; | |
197 | @@ -803,7 +803,7 @@ | |
198 | /* parameters' values, sources, constraints: TODO */ | |
199 | ||
200 | xmlDocDumpFormatMemory(doc, &xmlbuff, &buffersize, 1); | |
201 | - g_print ((gchar *) xmlbuff); | |
202 | + g_print ("%s", (gchar *) xmlbuff); | |
203 | ||
204 | xmlFreeDoc(doc); | |
205 | return (gchar *) xmlbuff; | |
5efe86bf JB |
206 | --- libgda-3.1.5/libgda/gda-query.c~ 2008-07-20 11:51:23.000000000 +0200 |
207 | +++ libgda-3.1.5/libgda/gda-query.c 2013-11-30 22:23:47.282756947 +0100 | |
00eee7f2 JR |
208 | @@ -2826,7 +2826,7 @@ |
209 | if ((gda_connection_event_get_event_type (GDA_CONNECTION_EVENT (list->data)) == | |
210 | GDA_CONNECTION_EVENT_ERROR) && | |
211 | !g_list_find (errors_before, list->data)) | |
212 | - g_set_error (error, GDA_QUERY_ERROR, GDA_QUERY_EXEC_ERROR, | |
213 | + g_set_error (error, GDA_QUERY_ERROR, GDA_QUERY_EXEC_ERROR, "%s", | |
214 | gda_connection_event_get_description (GDA_CONNECTION_EVENT (list->data))); | |
215 | } | |
216 | if (errors_before) | |
217 | @@ -4359,7 +4359,7 @@ | |
218 | errors = gda_data_model_import_get_errors (GDA_DATA_MODEL_IMPORT (model)); | |
219 | if (errors) { | |
220 | GError *err = (GError *) errors->data; | |
221 | - g_set_error (error, 0, 0, err->message); | |
222 | + g_set_error (error, 0, 0, "%s", err->message); | |
223 | g_object_unref (model); | |
224 | model = NULL; | |
225 | return FALSE; | |
5efe86bf JB |
226 | --- libgda-3.1.5/libgda/gda-query-field-value.c~ 2008-07-20 11:51:23.000000000 +0200 |
227 | +++ libgda-3.1.5/libgda/gda-query-field-value.c 2013-11-30 22:24:26.649835416 +0100 | |
00eee7f2 JR |
228 | @@ -1474,7 +1474,7 @@ |
229 | g_set_error (error, | |
230 | GDA_QUERY_FIELD_VALUE_ERROR, | |
231 | GDA_QUERY_FIELD_VALUE_RENDER_ERROR, | |
232 | - str); | |
233 | + "%s", str); | |
234 | g_free (str); | |
235 | ||
236 | /*g_print ("Param %p (%s) is invalid!\n", param_source, | |
5efe86bf JB |
237 | --- libgda-3.1.5/providers/mysql/gda-mysql-provider.c~ 2008-07-20 11:51:16.000000000 +0200 |
238 | +++ libgda-3.1.5/providers/mysql/gda-mysql-provider.c 2013-11-30 22:26:15.987641260 +0100 | |
00eee7f2 JR |
239 | @@ -282,7 +282,7 @@ |
240 | ||
241 | ||
242 | if (!mysql_ret) { | |
243 | - g_set_error (error, 0, 0, mysql_error (mysql)); | |
244 | + g_set_error (error, 0, 0, "%s", mysql_error (mysql)); | |
245 | g_free (mysql); | |
246 | return NULL; | |
247 | } | |
248 | @@ -767,7 +767,7 @@ | |
249 | g_free (sql); | |
250 | ||
251 | if (res) { | |
252 | - g_set_error (error, 0, 0, mysql_error (mysql)); | |
253 | + g_set_error (error, 0, 0, "%s", mysql_error (mysql)); | |
254 | mysql_close (mysql); | |
255 | return FALSE; | |
256 | } | |
5efe86bf JB |
257 | --- libgda-3.1.5/providers/mysql/gda-mysql-recordset.c~ 2008-07-20 11:51:16.000000000 +0200 |
258 | +++ libgda-3.1.5/providers/mysql/gda-mysql-recordset.c 2013-11-30 22:27:20.854980814 +0100 | |
00eee7f2 JR |
259 | @@ -314,7 +314,7 @@ |
260 | str = g_strdup_printf (_("Row number out of range 0 - %d"), | |
261 | priv_data->mysql_res_rows - 1); | |
262 | gda_connection_add_event_string (priv_data->cnc, str); | |
263 | - g_set_error (error, 0, 0, str); | |
264 | + g_set_error (error, 0, 0, "%s", str); | |
265 | g_free (str); | |
266 | ||
267 | return NULL; | |
268 | @@ -829,7 +829,7 @@ | |
269 | if (rc != 0) { | |
270 | GdaConnectionEvent *event = gda_mysql_make_error (mysql); | |
271 | gda_connection_add_event (priv_data->cnc, event); | |
272 | - g_set_error (error, 0, 0, | |
273 | + g_set_error (error, 0, 0, "%s", | |
274 | gda_connection_event_get_description (event)); | |
275 | return FALSE; | |
276 | } | |
5efe86bf JB |
277 | --- libgda-3.1.5/providers/postgres/gda-postgres-provider.c~ 2008-07-20 11:51:16.000000000 +0200 |
278 | +++ libgda-3.1.5/providers/postgres/gda-postgres-provider.c 2013-11-30 22:28:06.188783192 +0100 | |
00eee7f2 JR |
279 | @@ -1063,7 +1063,7 @@ |
280 | g_string_free (string, TRUE); | |
281 | ||
282 | if (PQstatus (pconn) != CONNECTION_OK) { | |
283 | - g_set_error (error, 0, 0, PQerrorMessage (pconn)); | |
284 | + g_set_error (error, 0, 0, "%s", PQerrorMessage (pconn)); | |
285 | PQfinish(pconn); | |
286 | ||
287 | return FALSE; | |
288 | @@ -1077,7 +1077,7 @@ | |
289 | pg_res = gda_postgres_PQexec_wrap (cnc, pconn, sql); | |
290 | g_free (sql); | |
291 | if (!pg_res || PQresultStatus (pg_res) != PGRES_COMMAND_OK) { | |
292 | - g_set_error (error, 0, 0, PQresultErrorMessage (pg_res)); | |
293 | + g_set_error (error, 0, 0, "%s", PQresultErrorMessage (pg_res)); | |
294 | PQfinish (pconn); | |
295 | return FALSE; | |
296 | } | |
5efe86bf JB |
297 | --- libgda-3.1.5/tools/gda-config-tool.c~ 2008-07-20 11:51:14.000000000 +0200 |
298 | +++ libgda-3.1.5/tools/gda-config-tool.c 2013-11-30 22:29:03.256038954 +0100 | |
00eee7f2 JR |
299 | @@ -1402,9 +1402,9 @@ |
300 | const char *paramInDsn = "DSN parameters:"; | |
301 | ||
302 | g_print ("Provider name: %s\n", info->id); | |
303 | - g_print (desc); | |
304 | + g_print ("%s", desc); | |
305 | pretty_print (info->description, strlen (desc)); | |
306 | - g_print (paramInDsn); | |
307 | + g_print ("%s", paramInDsn); | |
308 | str = g_string_new (NULL); | |
309 | if (info->gda_params) | |
310 | g_slist_foreach (info->gda_params->parameters, add_param_name_to_string, str); |