[GRASS-SVN] r66616 - in grass/branches/releasebranch_6_4: db/drivers/dbf db/drivers/ogr db/drivers/postgres imagery/i.landsat.toar imagery/i.rectify raster/r.flow raster/r.in.gdal raster/r.in.xyz raster/r.profile raster/r.quant raster/r.random.surface raster/r.reclass raster/r.to.vect raster3d/r3.out.v5d vector/v.in.ascii vector/v.in.ogr vector/v.net.allpairs vector/v.net.centrality vector/v.net.components vector/v.net.distance vector/v.net.flow vector/v.net.path vector/v.net.timetable vector/v.overlay vector/v.surf.rst vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Oct 27 06:58:52 PDT 2015
Author: neteler
Date: 2015-10-27 06:58:52 -0700 (Tue, 27 Oct 2015)
New Revision: 66616
Modified:
grass/branches/releasebranch_6_4/db/drivers/dbf/column.c
grass/branches/releasebranch_6_4/db/drivers/ogr/select.c
grass/branches/releasebranch_6_4/db/drivers/postgres/db.c
grass/branches/releasebranch_6_4/imagery/i.landsat.toar/landsat_met.c
grass/branches/releasebranch_6_4/imagery/i.rectify/cp.c
grass/branches/releasebranch_6_4/imagery/i.rectify/target.c
grass/branches/releasebranch_6_4/raster/r.flow/mem.h
grass/branches/releasebranch_6_4/raster/r.in.gdal/main.c
grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c
grass/branches/releasebranch_6_4/raster/r.profile/main.c
grass/branches/releasebranch_6_4/raster/r.quant/read_rules.c
grass/branches/releasebranch_6_4/raster/r.random.surface/init.c
grass/branches/releasebranch_6_4/raster/r.reclass/main.c
grass/branches/releasebranch_6_4/raster/r.to.vect/main.c
grass/branches/releasebranch_6_4/raster/r.to.vect/util.c
grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c
grass/branches/releasebranch_6_4/vector/v.in.ascii/points.c
grass/branches/releasebranch_6_4/vector/v.in.ogr/main.c
grass/branches/releasebranch_6_4/vector/v.net.allpairs/main.c
grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c
grass/branches/releasebranch_6_4/vector/v.net.components/main.c
grass/branches/releasebranch_6_4/vector/v.net.distance/main.c
grass/branches/releasebranch_6_4/vector/v.net.flow/main.c
grass/branches/releasebranch_6_4/vector/v.net.path/path.c
grass/branches/releasebranch_6_4/vector/v.net.timetable/main.c
grass/branches/releasebranch_6_4/vector/v.overlay/area_area.c
grass/branches/releasebranch_6_4/vector/v.overlay/line_area.c
grass/branches/releasebranch_6_4/vector/v.overlay/main.c
grass/branches/releasebranch_6_4/vector/v.surf.rst/main.c
grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c
grass/branches/releasebranch_6_4/vector/v.vol.rst/vector.c
Log:
fixes for fail to compile with -Werror=format-security (#2773) (partial backport from trunk, r66614)
Modified: grass/branches/releasebranch_6_4/db/drivers/dbf/column.c
===================================================================
--- grass/branches/releasebranch_6_4/db/drivers/dbf/column.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/db/drivers/dbf/column.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -39,7 +39,7 @@
sprintf(buf, "DBMI-DBF driver: column name '%s'", name);
name[DBF_COL_NAME - 1] = '\0';
sprintf(buf + strlen(buf), " truncated to '%s'", name);
- G_warning(buf);
+ G_warning("%s", buf);
}
/* Check if the column exists */
Modified: grass/branches/releasebranch_6_4/db/drivers/ogr/select.c
===================================================================
--- grass/branches/releasebranch_6_4/db/drivers/ogr/select.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/db/drivers/ogr/select.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -39,7 +39,7 @@
if (c->hLayer == NULL) {
append_error("Cannot select: \n");
- append_error(db_get_string(sel));
+ append_error("%s", db_get_string(sel));
append_error("\n");
report_error();
return DB_FAILED;
Modified: grass/branches/releasebranch_6_4/db/drivers/postgres/db.c
===================================================================
--- grass/branches/releasebranch_6_4/db/drivers/postgres/db.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/db/drivers/postgres/db.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -23,7 +23,7 @@
name = connection.databaseName;
G_debug(3,
- "db_driver_open_database() driver=pg database definition = '%s'",
+ "db_driver_open_database(): driver=pg database definition = '%s'",
name);
if (parse_conn(name, &pgconn) == DB_FAILED) {
Modified: grass/branches/releasebranch_6_4/imagery/i.landsat.toar/landsat_met.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.landsat.toar/landsat_met.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/imagery/i.landsat.toar/landsat_met.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -384,14 +384,14 @@
sprintf(key, "Band%dGainSetting", lsat->band[i].code);
get_mtldata(mtldata, key, value);
if (value[0] == '\0') {
- G_warning(key);
+ G_warning("%s", key);
continue;
}
lsat->band[i].gain = atof(value);
sprintf(key, "Band%dBiasSetting", lsat->band[i].code);
get_mtldata(mtldata, key, value);
if (value[0] == '\0') {
- G_warning(key);
+ G_warning("%s", key);
continue;
}
lsat->band[i].bias = atof(value);
Modified: grass/branches/releasebranch_6_4/imagery/i.rectify/cp.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.rectify/cp.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/imagery/i.rectify/cp.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -40,7 +40,7 @@
*/
return 1;
}
- G_fatal_error(msg);
+ G_fatal_error("%s", msg);
return 0; /* G_fatal_error() calls exit() */
}
Modified: grass/branches/releasebranch_6_4/imagery/i.rectify/target.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.rectify/target.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/imagery/i.rectify/target.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -34,6 +34,6 @@
error:
strcat(buf, _("Please run i.target for group."));
strcat(buf, group);
- G_fatal_error(buf);
+ G_fatal_error("%s", buf);
return 1; /* never reached */
}
Modified: grass/branches/releasebranch_6_4/raster/r.flow/mem.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.flow/mem.h 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.flow/mem.h 2015-10-27 13:58:52 UTC (rev 66616)
@@ -37,7 +37,7 @@
segment_get_row(l.seg, l.buf[row] - l.col_offset, \
row + l.row_offset) < 1)) ? \
(sprintf(string, "r.flow: cannot write segment file for %s", l.name),\
- G_fatal_error(string), (DCELL *) NULL) : \
+ G_fatal_error("%s", string), (DCELL *) NULL) : \
l.buf[row])
/* This was is Astley's version 12...
Modified: grass/branches/releasebranch_6_4/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.in.gdal/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.in.gdal/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -688,7 +688,7 @@
target_mapset, pszDstLoc);
strcat(errbuf, permissions == 0 ? _("permission denied")
: _("not found"));
- G_fatal_error(errbuf);
+ G_fatal_error("%s", errbuf);
} /* permission check */
/* And switch back to original location */
Modified: grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -1059,7 +1059,7 @@
sprintf(buff, _("%lu points found in region."), count_total);
- G_done_msg(buff);
+ G_done_msg("%s", buff);
G_debug(1, "Processed %lu lines.", line);
exit(EXIT_SUCCESS);
Modified: grass/branches/releasebranch_6_4/raster/r.profile/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.profile/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.profile/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -181,7 +181,7 @@
sprintf(formatbuff, _("[Along Track Dist.(m)] [Elevation]"));
if (clr)
strcat(formatbuff, _(" [RGB Color]"));
- G_message(formatbuff);
+ G_message("%s", formatbuff);
/* Get Profile Start Coords */
if (!parm.profile->answer && !parm.i->answer) {
Modified: grass/branches/releasebranch_6_4/raster/r.quant/read_rules.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.quant/read_rules.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.quant/read_rules.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -19,13 +19,13 @@
for (i = 0; i < noi; i++) {
if (G_read_fp_range(name[i], mapset[i], &drange) <= 0) {
sprintf(buff, "Can't read f_range for map %s", name[i]);
- G_fatal_error(buff);
+ G_fatal_error("%s", buff);
}
G_get_fp_range_min_max(&drange, &tmp_dmin, &tmp_dmax);
if (G_read_range(name[i], mapset[i], &range) <= 0) {
sprintf(buff, "Can't read range for map %s", name[i]);
- G_fatal_error(buff);
+ G_fatal_error("%s", buff);
}
G_get_range_min_max(&range, &tmp_min, &tmp_max);
if (!i || tmp_max > old_max || G_is_c_null_value(&old_max))
Modified: grass/branches/releasebranch_6_4/raster/r.random.surface/init.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.random.surface/init.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.random.surface/init.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -207,7 +207,7 @@
Seeds[i] = Seeds[i] % SEED_MAX;
sprintf(msg2, _(" seed is set to %d"), Seeds[i]);
strcat(msg, msg2);
- G_warning(msg);
+ G_warning("%s", msg);
}
else if (Seeds[i] < SEED_MIN) {
sprintf(msg, _("Seed (%d) smaller than minimum (%d)"),
@@ -216,7 +216,7 @@
Seeds[i] += SEED_MAX - SEED_MIN;
sprintf(msg2, _(" seed is set to %d"), Seeds[i]);
strcat(msg, msg2);
- G_warning(msg);
+ G_warning("%s", msg);
}
} /* /for */
} /* /else */
Modified: grass/branches/releasebranch_6_4/raster/r.reclass/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.reclass/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.reclass/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -124,7 +124,7 @@
}
else {
strcat(buf, _(" - invalid reclass rule"));
- G_fatal_error(buf);
+ G_fatal_error("%s", buf);
}
break;
Modified: grass/branches/releasebranch_6_4/raster/r.to.vect/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.to.vect/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.to.vect/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -189,7 +189,7 @@
db_append_string(&sql, ")");
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK)
G_fatal_error(_("Unable to create table: %s"),
@@ -268,7 +268,7 @@
sprintf(buf, "insert into %s values ( %d, '%s')", Fi->table,
cat, db_get_string(&label));
db_set_string(&sql, buf);
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK)
G_fatal_error(_("Unable to insert into table: %s"),
Modified: grass/branches/releasebranch_6_4/raster/r.to.vect/util.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.to.vect/util.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster/r.to.vect/util.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -150,7 +150,7 @@
db_append_string(&sql, ")");
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK)
G_fatal_error(_("Cannot insert new row: %s"), db_get_string(&sql));
Modified: grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -54,7 +54,7 @@
fatalError(_("Unable to close 3D raster map"));
}
- G3d_fatalError(errorMsg);
+ G3d_fatalError("%s", errorMsg);
}
/*---------------------------------------------------------------------------*/
Modified: grass/branches/releasebranch_6_4/vector/v.in.ascii/points.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.in.ascii/points.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.in.ascii/points.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -399,7 +399,7 @@
db_append_string(&sql, buf2);
}
db_append_string(&sql, ")");
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
G_fatal_error(_("Unable to insert new record: %s"),
Modified: grass/branches/releasebranch_6_4/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.in.ogr/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.in.ogr/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -595,7 +595,7 @@
strcat(error_msg,
_("Consider generating a new location with 'location' parameter"
" from input data set.\n"));
- G_fatal_error(error_msg);
+ G_fatal_error("%s", error_msg);
}
else {
G_message(_("Projection of input dataset and current location "
@@ -779,7 +779,7 @@
G_free(Ogr_fieldname);
}
db_append_string(&sql, ")");
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
driver =
db_start_driver_open_database(Fi->driver,
@@ -933,7 +933,7 @@
db_append_string(&sql, buf);
}
db_append_string(&sql, " )");
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database(driver);
Modified: grass/branches/releasebranch_6_4/vector/v.net.allpairs/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.allpairs/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.net.allpairs/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -146,7 +146,7 @@
Fi->table);
db_set_string(&sql, buf);
- G_debug(2, db_get_string(&sql));
+ G_debug(2, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
@@ -234,7 +234,7 @@
sprintf(buf, "insert into %s values (%d, %d, %f)",
Fi->table, spnode[i].cat, spnode[j].cat, cost);
db_set_string(&sql, buf);
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
Modified: grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -233,7 +233,7 @@
"create table %s(cat integer%s)", Fi->table, db_get_string(&tmp));
db_set_string(&sql, buf);
- G_debug(2, db_get_string(&sql));
+ G_debug(2, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
Modified: grass/branches/releasebranch_6_4/vector/v.net.components/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.components/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.net.components/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -31,7 +31,7 @@
sprintf(buf, "insert into %s values (%d, %d)", Fi->table, cat, comp);
db_set_string(sql, buf);
- G_debug(3, db_get_string(sql));
+ G_debug(3, "%s", db_get_string(sql));
if (db_execute_immediate(driver, sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
@@ -140,7 +140,7 @@
sprintf(buf, "create table %s ( cat integer, comp integer)", Fi->table);
db_set_string(&sql, buf);
- G_debug(2, db_get_string(&sql));
+ G_debug(2, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
Modified: grass/branches/releasebranch_6_4/vector/v.net.distance/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.distance/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.net.distance/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -201,7 +201,7 @@
Fi->table);
db_set_string(&sql, buf);
- G_debug(2, db_get_string(&sql));
+ G_debug(2, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
@@ -250,7 +250,7 @@
tcat, cost);
db_set_string(&sql, buf);
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
G_fatal_error(_("Cannot insert new record: %s"),
Modified: grass/branches/releasebranch_6_4/vector/v.net.flow/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.flow/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.net.flow/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -161,7 +161,7 @@
Fi->table);
db_set_string(&sql, buf);
- G_debug(2, db_get_string(&sql));
+ G_debug(2, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
@@ -237,7 +237,7 @@
sprintf(buf, "insert into %s values (%d, %f)", Fi->table, cat,
flow[i] / (double)In.cost_multip);
db_set_string(&sql, buf);
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
Modified: grass/branches/releasebranch_6_4/vector/v.net.path/path.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.path/path.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.net.path/path.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -102,7 +102,7 @@
Fi->table);
db_set_string(&sql, buf);
- G_debug(2, db_get_string(&sql));
+ G_debug(2, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
@@ -302,7 +302,7 @@
"insert into %s values ( %d, %d, %d, %d, %d, %f, %f, %f)",
Fi->table, cat, id, fcat, tcat, sp, cost, fdist, tdist);
db_set_string(&sql, buf);
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
Modified: grass/branches/releasebranch_6_4/vector/v.net.timetable/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.timetable/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.net.timetable/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -96,7 +96,7 @@
sprintf(buf, "create table %s (%s)", (*Fi)->table, columns);
db_set_string(&sql, buf);
- G_debug(2, db_get_string(&sql));
+ G_debug(2, "%s", db_get_string(&sql));
if (db_execute_immediate(*driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(*driver);
@@ -128,7 +128,7 @@
sprintf(buf, "insert into %s values (%d, %d, %d, %d, %d, %d)", table, cat,
path, stop_id, index, arrival_time, departure_time);
db_set_string(&sql, buf);
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql));
@@ -150,7 +150,7 @@
table, cat, path, from_id, to_id, route_id, index, from_time,
to_time);
db_set_string(&sql, buf);
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database_shutdown_driver(driver);
G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql));
Modified: grass/branches/releasebranch_6_4/vector/v.overlay/area_area.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.overlay/area_area.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.overlay/area_area.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -339,7 +339,7 @@
db_append_string(&stmt, " )");
- G_debug(3, db_get_string(&stmt));
+ G_debug(3, "%s", db_get_string(&stmt));
if (db_execute_immediate(driver, &stmt) != DB_OK)
G_warning(_("Unable to insert new record: '%s'"),
Modified: grass/branches/releasebranch_6_4/vector/v.overlay/line_area.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.overlay/line_area.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.overlay/line_area.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -212,7 +212,7 @@
db_append_string(&stmt, " )");
- G_debug(3, db_get_string(&stmt));
+ G_debug(3, "%s", db_get_string(&stmt));
if (db_execute_immediate(driver, &stmt) != DB_OK)
G_warning(_("Unable to insert new record: '%s'"),
Modified: grass/branches/releasebranch_6_4/vector/v.overlay/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.overlay/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.overlay/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -517,7 +517,7 @@
db_append_string(&stmt, " )");
- G_debug(3, db_get_string(&stmt));
+ G_debug(3, "%s", db_get_string(&stmt));
if (db_execute_immediate(driver, &stmt) != DB_OK) {
Vect_close(&Out);
Modified: grass/branches/releasebranch_6_4/vector/v.surf.rst/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.surf.rst/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.surf.rst/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -601,7 +601,7 @@
db_append_string(&sql2, "cat integer");
db_append_string(&sql2, ", flt1 double precision");
db_append_string(&sql2, ")");
- G_debug(1, db_get_string(&sql2));
+ G_debug(1, "%s", db_get_string(&sql2));
driver2 = db_start_driver_open_database(ff->driver, ff->database);
if (driver2 == NULL)
G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Modified: grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -584,7 +584,7 @@
db_append_string(&sql, "cat integer");
db_append_string(&sql, ", flt1 double precision");
db_append_string(&sql, ")");
- G_debug(1, db_get_string(&sql));
+ G_debug(1, "%s", db_get_string(&sql));
driver = db_start_driver_open_database(f->driver, f->database);
if (driver == NULL)
G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Modified: grass/branches/releasebranch_6_4/vector/v.vol.rst/vector.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.vol.rst/vector.c 2015-10-27 13:21:39 UTC (rev 66615)
+++ grass/branches/releasebranch_6_4/vector/v.vol.rst/vector.c 2015-10-27 13:58:52 UTC (rev 66616)
@@ -72,7 +72,7 @@
sprintf(buf, ", %f", err);
db_append_string(&sql, buf);
db_append_string(&sql, ")");
- G_debug(3, db_get_string(&sql));
+ G_debug(3, "%s", db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
db_close_database(driver);
More information about the grass-commit
mailing list