[GRASS-SVN] r66561 - in grass/trunk: db/drivers/dbf db/drivers/ogr db/drivers/postgres imagery/i.landsat.toar imagery/i.ortho.photo/i.ortho.rectify imagery/i.ortho.photo/lib imagery/i.rectify raster/r.external raster/r.flow raster/r.in.gdal raster/r.in.lidar raster/r.in.xyz raster/r.profile raster/r.quant raster/r.random.surface raster/r.reclass raster/r.to.rast3 raster/r.to.rast3elev raster/r.to.vect raster3d/r3.cross.rast raster3d/r3.in.ascii raster3d/r3.in.v5d raster3d/r3.out.ascii raster3d/r3.out.v5d raster3d/r3.retile raster3d/r3.to.rast vector/v.in.ascii vector/v.in.lidar vector/v.in.ogr vector/v.net 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.out.postgis vector/v.overlay vector/v.random vector/v.rectify vector/v.surf.rst vector/v.vol.rst vector/v.what.rast vector/v.what.rast3
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Oct 21 07:13:11 PDT 2015
Author: martinl
Date: 2015-10-21 07:13:11 -0700 (Wed, 21 Oct 2015)
New Revision: 66561
Modified:
grass/trunk/db/drivers/dbf/column.c
grass/trunk/db/drivers/ogr/select.c
grass/trunk/db/drivers/postgres/db.c
grass/trunk/imagery/i.landsat.toar/landsat_met.c
grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/cp.c
grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c
grass/trunk/imagery/i.ortho.photo/lib/camera.c
grass/trunk/imagery/i.ortho.photo/lib/conz_points.c
grass/trunk/imagery/i.ortho.photo/lib/fopen_camera.c
grass/trunk/imagery/i.ortho.photo/lib/init_info.c
grass/trunk/imagery/i.ortho.photo/lib/m_mult.c
grass/trunk/imagery/i.ortho.photo/lib/open_camera.c
grass/trunk/imagery/i.ortho.photo/lib/ref_points.c
grass/trunk/imagery/i.rectify/cp.c
grass/trunk/imagery/i.rectify/target.c
grass/trunk/raster/r.external/proj.c
grass/trunk/raster/r.flow/mem.h
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.in.lidar/main.c
grass/trunk/raster/r.in.xyz/main.c
grass/trunk/raster/r.profile/main.c
grass/trunk/raster/r.quant/read_rules.c
grass/trunk/raster/r.random.surface/init.c
grass/trunk/raster/r.reclass/main.c
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.to.vect/main.c
grass/trunk/raster/r.to.vect/util.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.in.ascii/main.c
grass/trunk/raster3d/r3.in.v5d/main.c
grass/trunk/raster3d/r3.out.ascii/main.c
grass/trunk/raster3d/r3.out.v5d/main.c
grass/trunk/raster3d/r3.retile/main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/vector/v.in.ascii/main.c
grass/trunk/vector/v.in.ascii/points.c
grass/trunk/vector/v.in.lidar/main.c
grass/trunk/vector/v.in.ogr/main.c
grass/trunk/vector/v.net.allpairs/main.c
grass/trunk/vector/v.net.centrality/main.c
grass/trunk/vector/v.net.components/main.c
grass/trunk/vector/v.net.distance/main.c
grass/trunk/vector/v.net.flow/main.c
grass/trunk/vector/v.net.path/path.c
grass/trunk/vector/v.net.timetable/main.c
grass/trunk/vector/v.net/main.c
grass/trunk/vector/v.out.postgis/create.c
grass/trunk/vector/v.overlay/area_area.c
grass/trunk/vector/v.overlay/line_area.c
grass/trunk/vector/v.overlay/main.c
grass/trunk/vector/v.random/main.c
grass/trunk/vector/v.rectify/cp.c
grass/trunk/vector/v.rectify/target.c
grass/trunk/vector/v.surf.rst/main.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.vol.rst/vector.c
grass/trunk/vector/v.what.rast/main.c
grass/trunk/vector/v.what.rast3/main.c
Log:
grass-7.0.1 fails to build when compiled with -Werror=format-security (#2773)
Modified: grass/trunk/db/drivers/dbf/column.c
===================================================================
--- grass/trunk/db/drivers/dbf/column.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/db/drivers/dbf/column.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -40,7 +40,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/trunk/db/drivers/ogr/select.c
===================================================================
--- grass/trunk/db/drivers/ogr/select.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/db/drivers/ogr/select.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -48,7 +48,7 @@
if (c->hLayer == NULL) {
db_d_append_error(_("Unable to select: \n"));
- db_d_append_error(db_get_string(sel));
+ db_d_append_error("%s", db_get_string(sel));
db_d_append_error("\n");
db_d_report_error();
return DB_FAILED;
Modified: grass/trunk/db/drivers/postgres/db.c
===================================================================
--- grass/trunk/db/drivers/postgres/db.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/db/drivers/postgres/db.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -250,7 +250,7 @@
if (PQstatus(pg_conn) == CONNECTION_BAD) {
db_d_append_error(_("Connection failed."));
db_d_append_error("\n");
- db_d_append_error(PQerrorMessage(pg_conn));
+ db_d_append_error("%s", PQerrorMessage(pg_conn));
db_d_report_error();
PQfinish(pg_conn);
return DB_FAILED;
@@ -271,7 +271,7 @@
else
db_d_append_error(_("Unable to drop database <%s>"), name);
db_d_append_error("\n");
- db_d_append_error(PQerrorMessage(pg_conn));
+ db_d_append_error("%s", PQerrorMessage(pg_conn));
db_d_report_error();
PQclear(res);
Modified: grass/trunk/imagery/i.landsat.toar/landsat_met.c
===================================================================
--- grass/trunk/imagery/i.landsat.toar/landsat_met.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.landsat.toar/landsat_met.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -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/trunk/imagery/i.ortho.photo/i.ortho.rectify/cp.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/cp.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/cp.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -31,7 +31,7 @@
default:
return 1;
}
- G_fatal_error(msg);
+ G_fatal_error("%s", msg);
}
int get_ref_points(void)
@@ -61,6 +61,6 @@
default:
return 1;
}
- G_fatal_error(msg);
+ G_fatal_error("%s", msg);
/* exit(1); shouldn't get here */
}
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -31,5 +31,5 @@
sprintf(buf, _("Mapset <%s> in target location <%s> - "), mapset, location);
strcat(buf, stat == 0 ? _("permission denied") : _("not found"));
error:
- G_fatal_error(buf);
+ G_fatal_error("%s", buf);
}
Modified: grass/trunk/imagery/i.ortho.photo/lib/camera.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/camera.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/lib/camera.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -36,7 +36,7 @@
sprintf(buf,
_("Unable to open camera file for group <%s> in mapset <%s>"),
group, G_mapset());
- G_warning(buf);
+ G_warning("%s", buf);
return 0;
}
G_getl2(buf, sizeof(buf), fd);
Modified: grass/trunk/imagery/i.ortho.photo/lib/conz_points.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/conz_points.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/lib/conz_points.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -104,7 +104,7 @@
sprintf(msg,
"unable to open control point (Z) file for group [%s in %s]",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
G_sleep(4);
return 0;
}
@@ -114,7 +114,7 @@
if (stat < 0) {
sprintf(msg, "bad format in control point file for group [%s in %s]",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
G_sleep(4);
return 0;
}
@@ -131,7 +131,7 @@
sprintf(msg,
"unable to create control point file for group [%s in %s]",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
G_sleep(4);
return 0;
}
@@ -156,7 +156,7 @@
sprintf(msg,
"unable to open control point (Z) file for group [%s in %s]",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
G_sleep(4);
return 0;
}
@@ -166,7 +166,7 @@
if (stat < 0) {
sprintf(msg, "bad format in control point file for group [%s in %s]",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
G_sleep(4);
return 0;
}
Modified: grass/trunk/imagery/i.ortho.photo/lib/fopen_camera.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/fopen_camera.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/lib/fopen_camera.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -46,7 +46,7 @@
sprintf(buf, "%s camera file [%s] in [%s %s] %s",
msga, camera, G_location(), G_mapset(), msgb);
- G_warning(buf);
+ G_warning("%s", buf);
return 0;
}
Modified: grass/trunk/imagery/i.ortho.photo/lib/init_info.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/init_info.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/lib/init_info.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -101,7 +101,7 @@
if (fd == NULL) {
sprintf(msg, "unable to open camera initial file %s in %s",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
return 0;
}
@@ -110,7 +110,7 @@
if (stat < 0) {
sprintf(msg, "bad format in camera initial file %s in %s",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
return 0;
}
return 1;
@@ -125,7 +125,7 @@
if (fd == NULL) {
sprintf(msg, "unable to open camera initial file %s in %s",
group, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
return 0;
}
Modified: grass/trunk/imagery/i.ortho.photo/lib/m_mult.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/m_mult.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/lib/m_mult.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -21,7 +21,7 @@
if (a->ncols != b->nrows) {
sprintf(message, "*: matrices not conformable, %d x %d * %d x %d\n",
a->nrows, a->ncols, b->nrows, b->ncols);
- fprintf(stderr, message);
+ fprintf(stderr, "%s", message);
return error(message);
}
Modified: grass/trunk/imagery/i.ortho.photo/lib/open_camera.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/open_camera.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/lib/open_camera.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -50,7 +50,7 @@
sprintf(buf, "%sfile [%s] of group [%s in %s]%s",
msga, file, camera, G_mapset(), msgb);
- G_warning(buf);
+ G_warning("%s", buf);
return 0;
}
Modified: grass/trunk/imagery/i.ortho.photo/lib/ref_points.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/ref_points.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.ortho.photo/lib/ref_points.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -97,7 +97,7 @@
sprintf(msg,
"unable to open reference point file for group [%s in %s]",
groupname, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
return 0;
}
@@ -108,7 +108,7 @@
sprintf(msg,
"bad format in reference point file for group [%s in %s]",
groupname, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
return 0;
}
return 1;
@@ -124,7 +124,7 @@
sprintf(msg,
"unable to create reference point file for group [%s in %s]",
groupname, G_mapset());
- G_warning(msg);
+ G_warning("%s", msg);
return 0;
}
Modified: grass/trunk/imagery/i.rectify/cp.c
===================================================================
--- grass/trunk/imagery/i.rectify/cp.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.rectify/cp.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -67,7 +67,7 @@
return 1;
}
}
- G_fatal_error(msg);
+ G_fatal_error("%s", msg);
return 0; /* G_fatal_error() calls exit() */
}
Modified: grass/trunk/imagery/i.rectify/target.c
===================================================================
--- grass/trunk/imagery/i.rectify/target.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/imagery/i.rectify/target.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -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/trunk/raster/r.external/proj.c
===================================================================
--- grass/trunk/raster/r.external/proj.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.external/proj.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -110,7 +110,7 @@
strcat(error_msg,
_("Consider generating a new location from the input dataset using "
"the 'location' parameter.\n"));
- G_fatal_error(error_msg);
+ G_fatal_error("%s", error_msg);
}
else {
G_message(_("Projection of input dataset and current location "
Modified: grass/trunk/raster/r.flow/mem.h
===================================================================
--- grass/trunk/raster/r.flow/mem.h 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.flow/mem.h 2015-10-21 14:13:11 UTC (rev 66561)
@@ -33,7 +33,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...
@@ -52,7 +52,7 @@
(Segment_get(as.seg, &v, \
row + as.row_offset, col + as.col_offset) < 1 ? \
(sprintf(string,"r.flow: cannot read segment file for %s",as.name), \
- G_fatal_error(string), 0) : \
+ G_fatal_error("%s", string), 0) : \
v) : \
(parm.mem ? \
aspect_fly(el.buf[row - 1] + col, \
@@ -64,7 +64,7 @@
(parm.seg ? \
(Segment_get(l.seg, &v, row + l.row_offset, col + l.col_offset) < 1 ? \
(sprintf(string,"r.flow: cannot read segment file for %s",l.name),\
- G_fatal_error(string), 0) : \
+ G_fatal_error("%s", string), 0) : \
v) : \
l.buf[row][col])
@@ -72,7 +72,7 @@
(parm.seg ? \
(v = w, \
Segment_put(l.seg, &v, row + l.row_offset, col + l.col_offset) < 1 ? \
- (sprintf(string,"r.flow: cannot write segment file for %s",l.name), \
- G_fatal_error(string), 0) : \
+ (sprintf(string, "r.flow: cannot write segment file for %s",l.name), \
+ G_fatal_error("%s", string), 0) : \
0) : \
(l.buf[row][col] = w))
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.in.gdal/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -894,7 +894,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/trunk/raster/r.in.lidar/main.c
===================================================================
--- grass/trunk/raster/r.in.lidar/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.in.lidar/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -474,7 +474,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 if (!shell_style->answer) {
G_message(_("Projection of input dataset and current location "
@@ -1364,7 +1364,7 @@
sprintf(buff, _("%lu points found in region."), count_total);
- G_done_msg(buff);
+ G_done_msg("%s", buff);
G_debug(1, "Processed %lu points.", line_total);
exit(EXIT_SUCCESS);
Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.in.xyz/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -1153,7 +1153,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/trunk/raster/r.profile/main.c
===================================================================
--- grass/trunk/raster/r.profile/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.profile/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -187,7 +187,7 @@
sprintf(formatbuff, _("Along track dist. [%s], Elevation"), unit);
if (clr)
strcat(formatbuff, _(" RGB color"));
- G_message(formatbuff);
+ G_message("%s", formatbuff);
/* Get Profile Start Coords */
if (parm.coord_file->answer) {
Modified: grass/trunk/raster/r.quant/read_rules.c
===================================================================
--- grass/trunk/raster/r.quant/read_rules.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.quant/read_rules.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -20,13 +20,13 @@
for (i = 0; i < noi; i++) {
if (Rast_read_fp_range(name[i], G_mapset(), &drange) <= 0) {
sprintf(buff, "Can't read f_range for map %s", name[i]);
- G_fatal_error(buff);
+ G_fatal_error("%s", buff);
}
Rast_get_fp_range_min_max(&drange, &tmp_dmin, &tmp_dmax);
if (Rast_read_range(name[i], G_mapset(), &range) <= 0) {
sprintf(buff, "Can't read range for map %s", name[i]);
- G_fatal_error(buff);
+ G_fatal_error("%s", buff);
}
Rast_get_range_min_max(&range, &tmp_min, &tmp_max);
if (!i || tmp_max > old_max || Rast_is_c_null_value(&old_max))
Modified: grass/trunk/raster/r.random.surface/init.c
===================================================================
--- grass/trunk/raster/r.random.surface/init.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.random.surface/init.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -110,7 +110,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)"),
@@ -119,7 +119,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/trunk/raster/r.reclass/main.c
===================================================================
--- grass/trunk/raster/r.reclass/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.reclass/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -121,7 +121,7 @@
}
else {
strcat(buf, _(" - invalid reclass rule"));
- G_fatal_error(buf);
+ G_fatal_error("%s", buf);
}
break;
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.to.rast3/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -64,7 +64,7 @@
close_input_raster_map(fd[i]);
}
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
exit(EXIT_FAILURE);
}
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -142,7 +142,7 @@
if (db.elev)
close_input_raster_map(db.elev);
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
exit(EXIT_FAILURE);
}
Modified: grass/trunk/raster/r.to.vect/main.c
===================================================================
--- grass/trunk/raster/r.to.vect/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.to.vect/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -216,7 +216,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"),
@@ -296,7 +296,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/trunk/raster/r.to.vect/util.c
===================================================================
--- grass/trunk/raster/r.to.vect/util.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster/r.to.vect/util.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -151,7 +151,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/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -62,7 +62,7 @@
if (elevfd != -1)
close_output_map(elevfd);
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
exit(EXIT_FAILURE);
}
Modified: grass/trunk/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster3d/r3.in.ascii/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -65,7 +65,7 @@
Rast3d_close(map);
}
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
}
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/raster3d/r3.in.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.v5d/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster3d/r3.in.v5d/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -48,7 +48,7 @@
/* should unopen map here! */
}
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
}
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster3d/r3.out.ascii/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -64,7 +64,7 @@
}
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
}
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster3d/r3.out.v5d/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -55,7 +55,7 @@
fatalError(_("Unable to close 3D raster map"));
}
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
}
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/raster3d/r3.retile/main.c
===================================================================
--- grass/trunk/raster3d/r3.retile/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster3d/r3.retile/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -54,7 +54,7 @@
Rast_unopen(fd[i]);
}
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
exit(EXIT_FAILURE);
}
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -60,7 +60,7 @@
Rast_unopen(fd[i]);
}
- Rast3d_fatal_error(errorMsg);
+ Rast3d_fatal_error("%s", errorMsg);
exit(EXIT_FAILURE);
}
Modified: grass/trunk/vector/v.in.ascii/main.c
===================================================================
--- grass/trunk/vector/v.in.ascii/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.in.ascii/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -404,7 +404,7 @@
Fi->driver);
/* Create table */
- 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"),
db_get_string(&sql));
Modified: grass/trunk/vector/v.in.ascii/points.c
===================================================================
--- grass/trunk/vector/v.in.ascii/points.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.in.ascii/points.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -446,7 +446,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/trunk/vector/v.in.lidar/main.c
===================================================================
--- grass/trunk/vector/v.in.lidar/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.in.lidar/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -593,7 +593,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_verbose_message(_("Projection of input dataset and current "
@@ -722,7 +722,7 @@
}
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,
@@ -964,7 +964,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) {
G_fatal_error(_("Cannot insert new row: %s"),
Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.in.ogr/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -1142,7 +1142,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,
@@ -1277,7 +1277,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/trunk/vector/v.net/main.c
===================================================================
--- grass/trunk/vector/v.net/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -180,7 +180,7 @@
if (file_arcs)
fclose(file_arcs);
- G_done_msg(message);
+ G_done_msg("%s", message);
return (EXIT_SUCCESS);
}
Modified: grass/trunk/vector/v.net.allpairs/main.c
===================================================================
--- grass/trunk/vector/v.net.allpairs/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net.allpairs/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -172,7 +172,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);
@@ -264,7 +264,7 @@
sprintf(buf, "insert into %s values (%d, %d, %d, %f)",
Fi->table, cat, 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/trunk/vector/v.net.centrality/main.c
===================================================================
--- grass/trunk/vector/v.net.centrality/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net.centrality/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -260,7 +260,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) {
G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
Modified: grass/trunk/vector/v.net.components/main.c
===================================================================
--- grass/trunk/vector/v.net.components/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net.components/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -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);
@@ -182,7 +182,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/trunk/vector/v.net.distance/main.c
===================================================================
--- grass/trunk/vector/v.net.distance/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net.distance/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -257,7 +257,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) {
G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
@@ -320,7 +320,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) {
G_fatal_error(_("Cannot insert new record: %s"),
db_get_string(&sql));
Modified: grass/trunk/vector/v.net.flow/main.c
===================================================================
--- grass/trunk/vector/v.net.flow/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net.flow/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -174,7 +174,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);
@@ -255,7 +255,7 @@
sprintf(buf, "insert into %s values (%d, %f)", Fi->table, cat,
flow[i] / (double)In.dgraph.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/trunk/vector/v.net.path/path.c
===================================================================
--- grass/trunk/vector/v.net.path/path.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net.path/path.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -103,7 +103,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) {
G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
@@ -327,7 +327,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) {
G_fatal_error(_("Cannot insert new record: %s"),
Modified: grass/trunk/vector/v.net.timetable/main.c
===================================================================
--- grass/trunk/vector/v.net.timetable/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.net.timetable/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -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/trunk/vector/v.out.postgis/create.c
===================================================================
--- grass/trunk/vector/v.out.postgis/create.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.out.postgis/create.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -77,9 +77,9 @@
G_set_key_value(tokens[0], tokens[1], key_val);
if (strcmp(tokens[0], "fid") == 0)
- G_asprintf(fid_column, tokens[1]);
+ G_asprintf(fid_column, "%s", tokens[1]);
if (strcmp(tokens[0], "geometry_name") == 0)
- G_asprintf(geom_column, tokens[1]);
+ G_asprintf(geom_column, "%s", tokens[1]);
G_free_tokens(tokens);
}
Modified: grass/trunk/vector/v.overlay/area_area.c
===================================================================
--- grass/trunk/vector/v.overlay/area_area.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.overlay/area_area.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -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/trunk/vector/v.overlay/line_area.c
===================================================================
--- grass/trunk/vector/v.overlay/line_area.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.overlay/line_area.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -404,7 +404,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/trunk/vector/v.overlay/main.c
===================================================================
--- grass/trunk/vector/v.overlay/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.overlay/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -572,7 +572,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/trunk/vector/v.random/main.c
===================================================================
--- grass/trunk/vector/v.random/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.random/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -463,7 +463,7 @@
sprintf(buf, "%.0f )", z);
db_append_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(_("Cannot insert new row: %s"),
db_get_string(&sql));
@@ -583,7 +583,7 @@
sprintf(buf, "%.0f )", z);
db_append_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(_("Cannot insert new row: %s"),
db_get_string(&sql));
Modified: grass/trunk/vector/v.rectify/cp.c
===================================================================
--- grass/trunk/vector/v.rectify/cp.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.rectify/cp.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -373,7 +373,7 @@
break;
}
if (ret != 1)
- G_fatal_error(msg);
+ G_fatal_error("%s", msg);
if (rms) {
compute_rms(&cp, &cp3, order, use3d, orthorot, sep, fpr);
Modified: grass/trunk/vector/v.rectify/target.c
===================================================================
--- grass/trunk/vector/v.rectify/target.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.rectify/target.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -42,6 +42,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/trunk/vector/v.surf.rst/main.c
===================================================================
--- grass/trunk/vector/v.surf.rst/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.surf.rst/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -581,7 +581,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/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.vol.rst/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -594,7 +594,7 @@
db_append_string(&sql, " 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/trunk/vector/v.vol.rst/vector.c
===================================================================
--- grass/trunk/vector/v.vol.rst/vector.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.vol.rst/vector.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -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);
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.what.rast/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -623,7 +623,7 @@
sprintf(buf, " AND %s", opt.where->answer);
db_append_string(&stmt, buf);
}
- G_debug(3, db_get_string(&stmt));
+ G_debug(3, "%s", db_get_string(&stmt));
/* Update table */
if (db_execute_immediate(driver, &stmt) == DB_OK) {
Modified: grass/trunk/vector/v.what.rast3/main.c
===================================================================
--- grass/trunk/vector/v.what.rast3/main.c 2015-10-21 13:16:29 UTC (rev 66560)
+++ grass/trunk/vector/v.what.rast3/main.c 2015-10-21 14:13:11 UTC (rev 66561)
@@ -305,7 +305,7 @@
G_snprintf(buf, 2048, " AND %s", opt.where->answer);
db_append_string(&stmt, buf);
}
- G_debug(3, db_get_string(&stmt));
+ G_debug(3, "%s", db_get_string(&stmt));
/* Update table */
if (db_execute_immediate(driver, &stmt) == DB_OK) {
More information about the grass-commit
mailing list