[GRASS-SVN] r32585 - in grass/trunk/lib: arraystats driver g3d gis
gmath gpde gpde/test imagery ogsf proj rst/interp_float
symbol vector/Vlib vector/diglib vector/vedit
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 6 18:00:01 EDT 2008
Author: neteler
Date: 2008-08-06 18:00:00 -0400 (Wed, 06 Aug 2008)
New Revision: 32585
Modified:
grass/trunk/lib/arraystats/class.c
grass/trunk/lib/driver/parse_ftcap.c
grass/trunk/lib/g3d/g3dopen.c
grass/trunk/lib/g3d/g3dparam.c
grass/trunk/lib/gis/adj_cellhd.c
grass/trunk/lib/gis/closecell.c
grass/trunk/lib/gis/get_ellipse.c
grass/trunk/lib/gis/get_row.c
grass/trunk/lib/gis/gisinit.c
grass/trunk/lib/gis/history.c
grass/trunk/lib/gis/legal_name.c
grass/trunk/lib/gis/opencell.c
grass/trunk/lib/gis/parser.c
grass/trunk/lib/gis/put_row.c
grass/trunk/lib/gis/reclass.c
grass/trunk/lib/gis/set_window.c
grass/trunk/lib/gis/spawn.c
grass/trunk/lib/gis/view.c
grass/trunk/lib/gmath/la.c
grass/trunk/lib/gpde/N_solvers.c
grass/trunk/lib/gpde/N_solvers_krylov.c
grass/trunk/lib/gpde/test/test_gwflow.c
grass/trunk/lib/gpde/test/test_heat.c
grass/trunk/lib/gpde/test/test_solute_transport.c
grass/trunk/lib/imagery/fopen.c
grass/trunk/lib/ogsf/GK2.c
grass/trunk/lib/ogsf/GS2.c
grass/trunk/lib/ogsf/Gp3.c
grass/trunk/lib/ogsf/Gs3.c
grass/trunk/lib/ogsf/Gv3.c
grass/trunk/lib/ogsf/gsd_img_mpeg.c
grass/trunk/lib/proj/convert.c
grass/trunk/lib/proj/get_proj.c
grass/trunk/lib/rst/interp_float/segmen2d.c
grass/trunk/lib/rst/interp_float/vinput2d.c
grass/trunk/lib/symbol/read.c
grass/trunk/lib/vector/Vlib/array.c
grass/trunk/lib/vector/Vlib/build_ogr.c
grass/trunk/lib/vector/Vlib/cats.c
grass/trunk/lib/vector/Vlib/cindex.c
grass/trunk/lib/vector/Vlib/field.c
grass/trunk/lib/vector/Vlib/intersect.c
grass/trunk/lib/vector/Vlib/legal_vname.c
grass/trunk/lib/vector/Vlib/map.c
grass/trunk/lib/vector/Vlib/net.c
grass/trunk/lib/vector/Vlib/open.c
grass/trunk/lib/vector/Vlib/open_nat.c
grass/trunk/lib/vector/Vlib/open_ogr.c
grass/trunk/lib/vector/Vlib/overlay.c
grass/trunk/lib/vector/Vlib/read.c
grass/trunk/lib/vector/Vlib/read_ogr.c
grass/trunk/lib/vector/Vlib/sindex.c
grass/trunk/lib/vector/Vlib/write_nat.c
grass/trunk/lib/vector/diglib/plus_area.c
grass/trunk/lib/vector/diglib/plus_node.c
grass/trunk/lib/vector/vedit/cats.c
Log:
fixed unlucky formatted messages (thanks to Glynn)
Modified: grass/trunk/lib/arraystats/class.c
===================================================================
--- grass/trunk/lib/arraystats/class.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/arraystats/class.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -217,8 +217,7 @@
}
if (j < (*nbreaks)) {
- G_warning(_
- ("There are classbreaks outside the range min-max. Number of classes reduced to %i, but using probabilities for %i classes."),
+ G_warning(_("There are classbreaks outside the range min-max. Number of classes reduced to %i, but using probabilities for %i classes."),
j + 1, *nbreaks + 1);
G_realloc(classbreaks, j * sizeof(double));
for (i = 0; i < j; i++)
Modified: grass/trunk/lib/driver/parse_ftcap.c
===================================================================
--- grass/trunk/lib/driver/parse_ftcap.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/driver/parse_ftcap.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -29,8 +29,7 @@
fp = NULL;
if ((capfile = getenv("GRASS_FONT_CAP"))) {
if ((fp = fopen(capfile, "r")) == NULL)
- G_warning(_
- ("%s: Unable to read font definition file; use the default"),
+ G_warning(_("%s: Unable to read font definition file; use the default"),
capfile);
}
if (fp == NULL) {
Modified: grass/trunk/lib/g3d/g3dopen.c
===================================================================
--- grass/trunk/lib/g3d/g3dopen.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/g3d/g3dopen.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -121,8 +121,7 @@
window = G3d_windowPtr();
if (proj != window->proj) {
- G3d_error(_
- ("G3d_openCellOld: projection does not match window projection"));
+ G3d_error(_("G3d_openCellOld: projection does not match window projection"));
return (void *)NULL;
}
if (zone != window->zone) {
@@ -144,8 +143,7 @@
/* if our long is to short to store offsets we can't read the file */
if (map->indexNbytesUsed > sizeof(long))
- G3d_fatalError(_
- ("G3d_openCellOld: index does not fit into long"));
+ G3d_fatalError(_("G3d_openCellOld: index does not fit into long"));
ltmp = G3d_malloc(map->indexLongNbytes);
if (ltmp == NULL) {
Modified: grass/trunk/lib/g3d/g3dparam.c
===================================================================
--- grass/trunk/lib/g3d/g3dparam.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/g3d/g3dparam.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -146,8 +146,7 @@
if (strcmp(param->dimension->answer, "default") != 0) {
if (sscanf(param->dimension->answer, "%dx%dx%d",
tileX, tileY, tileZ) != 3) {
- G3d_error(_
- ("G3d_getStandard3dParams: tile dimension value invalid"));
+ G3d_error(_("G3d_getStandard3dParams: tile dimension value invalid"));
return 0;
}
}
Modified: grass/trunk/lib/gis/adj_cellhd.c
===================================================================
--- grass/trunk/lib/gis/adj_cellhd.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/adj_cellhd.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -76,8 +76,7 @@
if (cellhd->north > 90.0) {
if (((cellhd->north - 90.0) < epsilon_ns) &&
((cellhd->north - 90.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of north boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of north boundary (%g>%g)"),
cellhd->north - 90.0, epsilon_ns);
cellhd->north = 90.0;
}
@@ -88,8 +87,7 @@
if (cellhd->south < -90.0) {
if (((cellhd->south + 90.0) < epsilon_ns) &&
((cellhd->south + 90.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of south boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of south boundary (%g>%g)"),
cellhd->south + 90.0, epsilon_ns);
cellhd->south = -90.0;
}
@@ -106,8 +104,7 @@
if ((cellhd->west < -180.0) && ((cellhd->west + 180.0) < epsilon_ew)
&& ((cellhd->west + 180.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of west boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of west boundary (%g>%g)"),
cellhd->west + 180.0, epsilon_ew);
cellhd->west = -180.0;
}
@@ -118,8 +115,7 @@
if ((cellhd->east > 180.0) && ((cellhd->east - 180.0) > epsilon_ew)
&& ((cellhd->east - 180.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of east boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of east boundary (%g>%g)"),
cellhd->east - 180.0, epsilon_ew);
cellhd->east = 180.0;
}
@@ -248,8 +244,7 @@
if (cellhd->north > 90.0) {
if (((cellhd->north - 90.0) < epsilon_ns) &&
((cellhd->north - 90.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of north boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of north boundary (%g>%g)"),
cellhd->north - 90.0, epsilon_ns);
cellhd->north = 90.0;
}
@@ -260,8 +255,7 @@
if (cellhd->south < -90.0) {
if (((cellhd->south + 90.0) < epsilon_ns) &&
((cellhd->south + 90.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of south boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of south boundary (%g>%g)"),
cellhd->south + 90.0, epsilon_ns);
cellhd->south = -90.0;
}
@@ -278,8 +272,7 @@
if ((cellhd->west < -180.0) && ((cellhd->west + 180.0) < epsilon_ew)
&& ((cellhd->west + 180.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of west boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of west boundary (%g>%g)"),
cellhd->west + 180.0, epsilon_ew);
cellhd->west = -180.0;
}
@@ -290,8 +283,7 @@
if ((cellhd->east > 180.0) && ((cellhd->east - 180.0) > epsilon_ew)
&& ((cellhd->east - 180.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of east boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of east boundary (%g>%g)"),
cellhd->east - 180.0, epsilon_ew);
cellhd->east = 180.0;
}
Modified: grass/trunk/lib/gis/closecell.c
===================================================================
--- grass/trunk/lib/gis/closecell.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/closecell.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -244,8 +244,7 @@
int cell_fd;
if (G__write_fp_format(fd) != 0) {
- G_warning(_
- ("Error writing floating point format file for map %s"),
+ G_warning(_("Error writing floating point format file for map %s"),
fcb->name);
stat = -1;
}
Modified: grass/trunk/lib/gis/get_ellipse.c
===================================================================
--- grass/trunk/lib/gis/get_ellipse.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/get_ellipse.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -354,8 +354,7 @@
str = G_find_key_value("a", proj_keys);
if (str != NULL) {
if (sscanf(str, "%lf", a) != 1) {
- G_fatal_error(_
- ("Invalid a: field '%s' in file %s in <%s>"),
+ G_fatal_error(_("Invalid a: field '%s' in file %s in <%s>"),
str, PROJECTION_FILE, PERMANENT);
}
}
Modified: grass/trunk/lib/gis/get_row.c
===================================================================
--- grass/trunk/lib/gis/get_row.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/get_row.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -43,8 +43,7 @@
/* check for row in window */
if (row < 0 || row >= G__.window.rows) {
- G_warning(_
- ("Reading raster map <%s@%s> request for row %d is outside region"),
+ G_warning(_("Reading raster map <%s@%s> request for row %d is outside region"),
fcb->name, fcb->mapset, row);
return -1;
@@ -299,8 +298,7 @@
while (cmapold++ != cmap[i]) /* skip */
if (!xdr_float(xdrs, &c[i]))
- G_fatal_error(_
- ("cell_values_float: xdr_float failed for index %d"),
+ G_fatal_error(_("cell_values_float: xdr_float failed for index %d"),
i);
cmapold--;
@@ -341,8 +339,7 @@
while (cmapold++ != cmap[i]) /* skip */
if (!xdr_double(xdrs, &c[i]))
- G_fatal_error(_
- ("cell_values_double: xdr_double failed for index %d"),
+ G_fatal_error(_("cell_values_double: xdr_double failed for index %d"),
i);
cmapold--;
@@ -489,8 +486,7 @@
if (!fcb->io_error) {
if (fcb->cellhd.compressed)
- G_warning(_
- ("Error reading compressed map <%s@%s>, row %d"),
+ G_warning(_("Error reading compressed map <%s@%s>, row %d"),
fcb->name, fcb->mapset, r);
else
G_warning(_("Error reading map <%s@%s>, row %d"),
@@ -918,8 +914,7 @@
int i, j, null_fd;
if (row > G__.window.rows || row < 0) {
- G_warning(_
- ("Reading raster map <%s@%s> request for row %d is outside region"),
+ G_warning(_("Reading raster map <%s@%s> request for row %d is outside region"),
fcb->name, fcb->mapset, row);
}
Modified: grass/trunk/lib/gis/gisinit.c
===================================================================
--- grass/trunk/lib/gis/gisinit.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/gisinit.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -105,8 +105,7 @@
{
if (initialized)
return 1;
- G_warning(_
- ("System not initialized. Programmer forgot to call G_gisinit()."));
+ G_warning(_("System not initialized. Programmer forgot to call G_gisinit()."));
G_sleep(3);
exit(EXIT_FAILURE);
}
Modified: grass/trunk/lib/gis/history.c
===================================================================
--- grass/trunk/lib/gis/history.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/history.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -260,8 +260,7 @@
cmdlen = strlen(cmdlin);
if (hist->edlinecnt > MAXEDLINES - 2) {
- G_warning(_
- ("Not enough room in history file to record command line."));
+ G_warning(_("Not enough room in history file to record command line."));
return 1;
}
@@ -283,8 +282,7 @@
j += 68;
hist->edlinecnt++;
if (hist->edlinecnt > MAXEDLINES - 2) {
- G_warning(_
- ("Not enough room in history file for command line (truncated)."));
+ G_warning(_("Not enough room in history file for command line (truncated)."));
return 2;
}
}
Modified: grass/trunk/lib/gis/legal_name.c
===================================================================
--- grass/trunk/lib/gis/legal_name.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/legal_name.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -74,8 +74,7 @@
return 0; /* don't die on undefined parameters */
if (G_legal_filename(output) == -1) {
if (error == GR_FATAL_EXIT) {
- G_fatal_error(_
- ("Output raster map name <%s> is not valid map name"),
+ G_fatal_error(_("Output raster map name <%s> is not valid map name"),
output);
}
else if (error == GR_FATAL_PRINT) {
Modified: grass/trunk/lib/gis/opencell.c
===================================================================
--- grass/trunk/lib/gis/opencell.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/opencell.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -258,8 +258,7 @@
r_name = reclass.name;
r_mapset = reclass.mapset;
if (G_find_cell2(r_name, r_mapset) == NULL) {
- G_warning(_
- ("unable to open [%s] in [%s] since it is a reclass of [%s] in [%s] which does not exist"),
+ G_warning(_("unable to open [%s] in [%s] since it is a reclass of [%s] in [%s] which does not exist"),
name, mapset, r_name, r_mapset);
return -1;
}
@@ -282,23 +281,20 @@
{
CELL_nbytes = cellhd.format + 1;
if (CELL_nbytes < 1) {
- G_warning(_
- ("[%s] in mapset [%s]-format field in header file invalid"),
+ G_warning(_("[%s] in mapset [%s]-format field in header file invalid"),
r_name, r_mapset);
return -1;
}
}
if (cellhd.proj != G__.window.proj) {
- G_warning(_
- ("[%s] in mapset [%s] - in different projection than current region:\n found map [%s] in: <%s>, should be <%s> "),
+ G_warning(_("[%s] in mapset [%s] - in different projection than current region:\n found map [%s] in: <%s>, should be <%s> "),
name, mapset, name, G__projection_name(cellhd.proj),
G__projection_name(G__.window.proj));
return -1;
}
if (cellhd.zone != G__.window.zone) {
- G_warning(_
- ("[%s] in mapset [%s] - in different zone [%d] than current region [%d]"),
+ G_warning(_("[%s] in mapset [%s] - in different zone [%d] than current region [%d]"),
name, mapset, cellhd.zone, G__.window.zone);
return -1;
}
@@ -689,8 +685,7 @@
}
if (open_mode == OPEN_NEW_RANDOM) {
- G_warning(_
- ("Can't write embedded null values for map open for random access"));
+ G_warning(_("Can't write embedded null values for map open for random access"));
if (fcb->map_type == CELL_TYPE)
G_write_zeros(fd,
(long)WRITE_NBYTES * fcb->cellhd.cols *
Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/parser.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -770,8 +770,7 @@
j++;
}
if (!found) {
- G_warning(_
- ("BUG in descriptions, option %s in %s does not exist"),
+ G_warning(_("BUG in descriptions, option %s in %s does not exist"),
tokens[i], opt->key);
}
else {
@@ -866,8 +865,7 @@
sprintf(buff, "GRASS_VERBOSE=%d", G_verbose_max());
putenv(G_store(buff));
if (quiet == 1) {
- G_warning(_
- ("Use either --quiet or --verbose flag, not both. Assuming --verbose."));
+ G_warning(_("Use either --quiet or --verbose flag, not both. Assuming --verbose."));
}
quiet = -1;
}
@@ -881,8 +879,7 @@
sprintf(buff, "GRASS_VERBOSE=%d", G_verbose_min());
putenv(G_store(buff));
if (quiet == -1) {
- G_warning(_
- ("Use either --quiet or --verbose flag, not both. Assuming --quiet."));
+ G_warning(_("Use either --quiet or --verbose flag, not both. Assuming --quiet."));
}
quiet = 1; /* for passing to gui init */
}
Modified: grass/trunk/lib/gis/put_row.c
===================================================================
--- grass/trunk/lib/gis/put_row.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/put_row.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -212,8 +212,7 @@
struct fileinfo *fcb = &G__.fileinfo[fd];
if (fcb->map_type != CELL_TYPE) {
- G_fatal_error(_
- ("G_put_map_row: %s is not integer! Use G_put_[f/d]_raster_row()!"),
+ G_fatal_error(_("G_put_map_row: %s is not integer! Use G_put_[f/d]_raster_row()!"),
fcb->name);
return -1;
}
@@ -257,16 +256,14 @@
if (!random)
return 1;
- G_warning(_
- ("%s: map [%s] not open for random write - request ignored"),
+ G_warning(_("%s: map [%s] not open for random write - request ignored"),
me, fcb->name);
break;
case OPEN_NEW_RANDOM:
if (random)
return 1;
- G_warning(_
- ("%s: map [%s] not open for sequential write - request ignored"),
+ G_warning(_("%s: map [%s] not open for sequential write - request ignored"),
me, fcb->name);
break;
default:
Modified: grass/trunk/lib/gis/reclass.c
===================================================================
--- grass/trunk/lib/gis/reclass.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/reclass.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -143,8 +143,7 @@
G_warning(_("Too many reclass categories for [%s in %s]"),
name, mapset);
else
- G_warning(_
- ("Illegal reclass format in header file for [%s in %s]"),
+ G_warning(_("Illegal reclass format in header file for [%s in %s]"),
name, mapset);
stat = -1;
}
Modified: grass/trunk/lib/gis/set_window.c
===================================================================
--- grass/trunk/lib/gis/set_window.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/set_window.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -73,8 +73,7 @@
G__.fileinfo[i].cellhd.proj == window->proj)
continue;
if (i != maskfd) {
- G_warning(_
- ("G_set_window(): projection/zone differs from that of "
+ G_warning(_("G_set_window(): projection/zone differs from that of "
"currently open raster maps"));
return -1;
}
Modified: grass/trunk/lib/gis/spawn.c
===================================================================
--- grass/trunk/lib/gis/spawn.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/spawn.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -355,8 +355,7 @@
}
if (dup2(r->src_fd, r->dst_fd) < 0) {
- G_warning(_
- ("G_spawn: unable to duplicate descriptor %d to %d"),
+ G_warning(_("G_spawn: unable to duplicate descriptor %d to %d"),
r->src_fd, r->dst_fd);
_exit(127);
}
@@ -365,8 +364,7 @@
}
else if (r->src_fd >= 0) {
if (dup2(r->src_fd, r->dst_fd) < 0) {
- G_warning(_
- ("G_spawn: unable to duplicate descriptor %d to %d"),
+ G_warning(_("G_spawn: unable to duplicate descriptor %d to %d"),
r->src_fd, r->dst_fd);
_exit(127);
}
Modified: grass/trunk/lib/gis/view.c
===================================================================
--- grass/trunk/lib/gis/view.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gis/view.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -543,13 +543,11 @@
{
switch (vis) {
case 0:
- G_warning(_
- (" Window saved in \"%s\" is completely outside of current GRASS window."),
+ G_warning(_(" Window saved in \"%s\" is completely outside of current GRASS window."),
viewname);
break;
default:
- G_warning(_
- (" Only %d%% of window saved in \"%s\" overlaps with current GRASS window."),
+ G_warning(_(" Only %d%% of window saved in \"%s\" overlaps with current GRASS window."),
vis, viewname);
break;
}
Modified: grass/trunk/lib/gmath/la.c
===================================================================
--- grass/trunk/lib/gmath/la.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gmath/la.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -527,8 +527,7 @@
G_matrix_free(mtx);
if (res_info > 0) {
- G_warning(_
- ("Matrix (or submatrix is singular). Solution undetermined"));
+ G_warning(_("Matrix (or submatrix is singular). Solution undetermined"));
return 1;
}
else if (res_info < 0) {
@@ -539,8 +538,7 @@
}
default:
{
- G_warning(_
- ("Procedure not yet available for selected matrix type"));
+ G_warning(_("Procedure not yet available for selected matrix type"));
return -1;
}
} /* end switch */
Modified: grass/trunk/lib/gpde/N_solvers.c
===================================================================
--- grass/trunk/lib/gpde/N_solvers.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gpde/N_solvers.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -47,8 +47,7 @@
{
if (les->type != N_NORMAL_LES) {
- G_warning(_
- ("The gauss elimination solver does not work with sparse matrices"));
+ G_warning(_("The gauss elimination solver does not work with sparse matrices"));
return 0;
}
@@ -153,8 +152,7 @@
int N_solver_cholesky(N_les * les)
{
if (les->type != N_NORMAL_LES) {
- G_warning(_
- ("The cholesky solver does not work with sparse matrices"));
+ G_warning(_("The cholesky solver does not work with sparse matrices"));
return 0;
}
Modified: grass/trunk/lib/gpde/N_solvers_krylov.c
===================================================================
--- grass/trunk/lib/gpde/N_solvers_krylov.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gpde/N_solvers_krylov.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -187,8 +187,7 @@
;
}
else {
- G_warning(_
- ("Unable to solve the linear equation system"));
+ G_warning(_("Unable to solve the linear equation system"));
error_break = 1;
}
}
@@ -355,8 +354,7 @@
;
}
else {
- G_warning(_
- ("Unable to solve the linear equation system"));
+ G_warning(_("Unable to solve the linear equation system"));
error_break = 1;
}
}
@@ -480,8 +478,7 @@
;
}
else {
- G_warning(_
- ("Unable to solve the linear equation system"));
+ G_warning(_("Unable to solve the linear equation system"));
error_break = 1;
}
Modified: grass/trunk/lib/gpde/test/test_gwflow.c
===================================================================
--- grass/trunk/lib/gpde/test/test_gwflow.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gpde/test/test_gwflow.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -51,8 +51,7 @@
if (sum > 0)
G_warning(_("\n-- gwflow integration tests failure --"));
else
- G_message(_
- ("\n-- gwflow integration tests finished successfully --"));
+ G_message(_("\n-- gwflow integration tests finished successfully --"));
return sum;
}
Modified: grass/trunk/lib/gpde/test/test_heat.c
===================================================================
--- grass/trunk/lib/gpde/test/test_heat.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gpde/test/test_heat.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -39,8 +39,7 @@
if (sum > 0)
G_warning(_("\n-- heat flow integration tests failure --"));
else
- G_message(_
- ("\n-- heat flow integration tests finished successfully --"));
+ G_message(_("\n-- heat flow integration tests finished successfully --"));
return sum;
}
Modified: grass/trunk/lib/gpde/test/test_solute_transport.c
===================================================================
--- grass/trunk/lib/gpde/test/test_solute_transport.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/gpde/test/test_solute_transport.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -51,8 +51,7 @@
if (sum > 0)
G_warning(_("\n-- solute_transport integration tests failure --"));
else
- G_message(_
- ("\n-- solute_transport integration tests finished successfully --"));
+ G_message(_("\n-- solute_transport integration tests finished successfully --"));
return sum;
}
Modified: grass/trunk/lib/imagery/fopen.c
===================================================================
--- grass/trunk/lib/imagery/fopen.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/imagery/fopen.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -76,8 +76,7 @@
fd = G_fopen_new_misc("group", element, group);
if (!fd)
- G_warning(_
- ("Unable to create file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to create file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return fd;
@@ -99,8 +98,7 @@
fd = G_fopen_append_misc("group", element, group);
if (!fd)
- G_warning(_
- ("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return fd;
@@ -115,8 +113,7 @@
/* find file first */
if (!I_find_subgroup_file(group, subgroup, file)) {
- G_warning(_
- ("Unable to find file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to find file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return ((FILE *) NULL);
@@ -127,8 +124,7 @@
fd = G_fopen_old_misc("group", element, group, G_mapset());
if (!fd)
- G_warning(_
- ("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return fd;
Modified: grass/trunk/lib/ogsf/GK2.c
===================================================================
--- grass/trunk/lib/ogsf/GK2.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/ogsf/GK2.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -272,8 +272,7 @@
Views = gk_make_linear_framesfromkeys(Keys, Numkeys, Viewsteps, loop);
if (!Views) {
- G_warning(_
- ("Check no. of frames requested and keyframes marked"));
+ G_warning(_("Check no. of frames requested and keyframes marked"));
}
}
else if (Numkeys > 2) {
@@ -286,8 +285,7 @@
(Keys, Numkeys, Viewsteps, loop, 1.0 - Tension);
if (!Views) {
- G_warning(_
- ("Check no. of frames requested and keyframes marked"));
+ G_warning(_("Check no. of frames requested and keyframes marked"));
}
}
Modified: grass/trunk/lib/ogsf/GS2.c
===================================================================
--- grass/trunk/lib/ogsf/GS2.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/ogsf/GS2.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -1633,8 +1633,7 @@
if (rast_head.north <= wind.south ||
rast_head.south >= wind.north ||
rast_head.east <= wind.west || rast_head.west >= wind.east) {
- G_fatal_error(_
- ("Raster map <%s> is outside of current region. Load failed."),
+ G_fatal_error(_("Raster map <%s> is outside of current region. Load failed."),
filename);
}
@@ -1715,15 +1714,13 @@
}
if (0 > gs_malloc_att_buff(gs, att, ATTY_NULL)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
switch (atty) {
case ATTY_MASK:
if (0 > gs_malloc_att_buff(gs, att, ATTY_MASK)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_bitmap(&wind, filename, tbuff->bm);
@@ -1732,8 +1729,7 @@
break;
case ATTY_CHAR:
if (0 > gs_malloc_att_buff(gs, att, ATTY_CHAR)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_char(&wind, filename, tbuff->cb,
@@ -1743,8 +1739,7 @@
break;
case ATTY_SHORT:
if (0 > gs_malloc_att_buff(gs, att, ATTY_SHORT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_short(&wind, filename, tbuff->sb,
@@ -1754,8 +1749,7 @@
break;
case ATTY_FLOAT:
if (0 > gs_malloc_att_buff(gs, att, ATTY_FLOAT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_float(&wind, filename, tbuff->fb,
@@ -1766,8 +1760,7 @@
case ATTY_INT:
default:
if (0 > gs_malloc_att_buff(gs, att, ATTY_INT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_int(&wind, filename, tbuff->ib,
@@ -1820,8 +1813,7 @@
else if (ATTY_FLOAT == atty) {
if (!reuse) {
if (0 > gs_malloc_att_buff(gs, att, ATTY_INT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
Gs_pack_colors_float(filename, tbuff->fb, tbuff->ib,
Modified: grass/trunk/lib/ogsf/Gp3.c
===================================================================
--- grass/trunk/lib/ogsf/Gp3.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/ogsf/Gp3.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -201,8 +201,7 @@
Vect_close(&map);
if (!np) {
- G_warning(_
- ("No points from vector map <%s> fall within current region"),
+ G_warning(_("No points from vector map <%s> fall within current region"),
G_fully_qualified_name(grassname, mapset));
return (NULL);
}
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/ogsf/Gs3.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -640,8 +640,7 @@
G_get_color_range(&min, &max, &colrules);
if (min < 0 || max > 255) {
- G_warning(_
- ("Color table range doesn't match data (mincol=%d, maxcol=%d"),
+ G_warning(_("Color table range doesn't match data (mincol=%d, maxcol=%d"),
min, max);
min = min < 0 ? 0 : min;
Modified: grass/trunk/lib/ogsf/Gv3.c
===================================================================
--- grass/trunk/lib/ogsf/Gv3.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/ogsf/Gv3.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -246,8 +246,7 @@
Vect_close(&map);
if (!nl) {
- G_warning(_
- ("No features from vector map <%s> fall within current region"),
+ G_warning(_("No features from vector map <%s> fall within current region"),
G_fully_qualified_name(grassname, mapset));
return (NULL);
}
Modified: grass/trunk/lib/ogsf/gsd_img_mpeg.c
===================================================================
--- grass/trunk/lib/ogsf/gsd_img_mpeg.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/ogsf/gsd_img_mpeg.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -303,8 +303,7 @@
/* auto detect the output format from the name. default is mpeg. */
fmt = guess_format(NULL, filename, NULL);
if (!fmt) {
- G_warning(_
- ("Unable to deduce output format from file extension: using MPEG"));
+ G_warning(_("Unable to deduce output format from file extension: using MPEG"));
fmt = guess_format("mpeg", NULL, NULL);
}
if (!fmt) {
Modified: grass/trunk/lib/proj/convert.c
===================================================================
--- grass/trunk/lib/proj/convert.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/proj/convert.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -381,8 +381,7 @@
G_set_key_value("proj", pszProj, *projinfo);
}
else
- G_warning(_
- ("No projection name! Projection parameters likely to be meaningless."));
+ G_warning(_("No projection name! Projection parameters likely to be meaningless."));
/* -------------------------------------------------------------------- */
@@ -418,8 +417,7 @@
if (datum == NULL) {
if (paramspresent < 2)
/* Only give warning if no parameters present */
- G_warning(_
- ("Datum <%s> not recognised by GRASS and no parameters found"),
+ G_warning(_("Datum <%s> not recognised by GRASS and no parameters found"),
pszDatumName);
}
else {
@@ -435,13 +433,11 @@
GPJ_get_default_datum_params_by_name(datum, ¶ms);
if (paramsets < 0)
- G_warning(_
- ("Datum <%s> apparently recognised by GRASS but no parameters found. "
+ G_warning(_("Datum <%s> apparently recognised by GRASS but no parameters found. "
"You may want to look into this."), datum);
else if (datumtrans > paramsets) {
- G_warning(_
- ("Invalid tranformation number %d; valid range is 1 to %d. "
+ G_warning(_("Invalid tranformation number %d; valid range is 1 to %d. "
"Leaving datum transform parameters unspecified."),
datumtrans, paramsets);
datumtrans = 0;
Modified: grass/trunk/lib/proj/get_proj.c
===================================================================
--- grass/trunk/lib/proj/get_proj.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/proj/get_proj.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -294,8 +294,7 @@
if (nsize = strlen(s), nsize) {
if (nopt >= MAX_PARGS) {
fprintf(stderr, "nopt = %d, s=%s\n", nopt, str);
- G_fatal_error(_
- ("Option input overflowed option table"));
+ G_fatal_error(_("Option input overflowed option table"));
}
if (strncmp("zone=", s, 5) == 0) {
Modified: grass/trunk/lib/rst/interp_float/segmen2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/segmen2d.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/rst/interp_float/segmen2d.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -110,8 +110,7 @@
while ((npt < MINPTS) || (npt > params->KMAX2)) {
if (i >= 70) {
fprintf(stderr, "\n");
- G_warning(_
- ("taking too long to find points for interpolation--"
+ G_warning(_("taking too long to find points for interpolation--"
"please change the region to area where your points are. "
"Continuing calculations..."));
break;
Modified: grass/trunk/lib/rst/interp_float/vinput2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/vinput2d.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/rst/interp_float/vinput2d.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -89,12 +89,10 @@
zctype = db_column_Ctype(driver, Fi->table, zcol);
G_debug(3, " zcol C type = %d", zctype);
if (zctype == -1)
- G_fatal_error(_
- ("Cannot find z column <%s> (please verify name, e.g. with v.info)"),
+ G_fatal_error(_("Cannot find z column <%s> (please verify name, e.g. with v.info)"),
zcol);
if (zctype != DB_C_TYPE_INT && zctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of z column is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of z column is not supported (must be integer or double)"));
db_CatValArray_init(&zarray);
G_debug(3, "RST SQL WHERE: %s", params->wheresql);
@@ -107,11 +105,9 @@
if (sctype == -1)
G_fatal_error(_("Cannot read column type of smooth column"));
if (sctype == DB_C_TYPE_DATETIME)
- G_fatal_error(_
- ("Column type of smooth column (datetime) is not supported"));
+ G_fatal_error(_("Column type of smooth column (datetime) is not supported"));
if (sctype != DB_C_TYPE_INT && sctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of s column is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of s column is not supported (must be integer or double)"));
db_CatValArray_init(&sarray);
db_select_CatValArray(driver, Fi->table, Fi->key, scol,
@@ -332,16 +328,14 @@
fprintf(stderr, "\n");
if (OUTRANGE > 0)
- G_warning(_
- ("there are points outside specified 2D/3D region--ignored %d points"),
+ G_warning(_("there are points outside specified 2D/3D region--ignored %d points"),
OUTRANGE);
if (npoint > 0)
G_warning(_("ignoring %d points -- too dense"), npoint);
npoint = k - npoint - OUTRANGE;
if (npoint < params->kmin) {
if (npoint != 0) {
- G_warning(_
- ("%d points given for interpolation (after thinning) is less than given NPMIN=%d"),
+ G_warning(_("%d points given for interpolation (after thinning) is less than given NPMIN=%d"),
npoint, params->kmin);
params->kmin = npoint;
}
Modified: grass/trunk/lib/symbol/read.c
===================================================================
--- grass/trunk/lib/symbol/read.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/symbol/read.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -251,8 +251,7 @@
strcpy(group, sname);
c = strchr(group, '/');
if (c == NULL) {
- G_warning(_
- ("Incorrect symbol name: '%s' (should be: group/name or group/name at mapset)"),
+ G_warning(_("Incorrect symbol name: '%s' (should be: group/name or group/name at mapset)"),
sname);
return NULL;
}
@@ -376,8 +375,7 @@
}
else if (sscanf(data, "%d %d %d", &r, &g, &b) == 3) {
if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
- G_warning(_
- ("Incorrect symbol color: '%s', using default."),
+ G_warning(_("Incorrect symbol color: '%s', using default."),
buf);
else {
fr = r / 255.0;
@@ -405,8 +403,7 @@
}
else if (sscanf(data, "%d %d %d", &r, &g, &b) == 3) {
if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
- G_warning(_
- ("Incorrect symbol color: '%s', using default."),
+ G_warning(_("Incorrect symbol color: '%s', using default."),
buf);
else {
fr = r / 255.0;
Modified: grass/trunk/lib/vector/Vlib/array.c
===================================================================
--- grass/trunk/lib/vector/Vlib/array.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/array.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -289,8 +289,7 @@
db_close_database_shutdown_driver(driver);
if (ncats == -1) {
- G_warning(_
- ("Unable to select record from table <%s> (key %s, where %s)"),
+ G_warning(_("Unable to select record from table <%s> (key %s, where %s)"),
Fi->table, Fi->key, where);
return -1;
}
Modified: grass/trunk/lib/vector/Vlib/build_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/build_ogr.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/build_ogr.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -345,8 +345,7 @@
/* test layer capabilities */
if (!OGR_L_TestCapability(Map->fInfo.ogr.layer, OLCRandomRead)) {
- G_warning(_
- ("Random read is not supported by OGR for this layer, cannot build support"));
+ G_warning(_("Random read is not supported by OGR for this layer, cannot build support"));
return 0;
}
Modified: grass/trunk/lib/vector/Vlib/cats.c
===================================================================
--- grass/trunk/lib/vector/Vlib/cats.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/cats.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -126,8 +126,7 @@
/* field was not found so we shall append new cat */
/* test if space exist */
if (n >= GV_NCATS_MAX) {
- G_fatal_error(_
- ("Too many categories (%d), unable to set cat %d (layer %d)"),
+ G_fatal_error(_("Too many categories (%d), unable to set cat %d (layer %d)"),
Cats->n_cats, cat, field);
}
@@ -374,8 +373,7 @@
max = min;
else { /* error */
- G_warning(_
- ("Unable to convert category string '%s' (from '%s') to category range"),
+ G_warning(_("Unable to convert category string '%s' (from '%s') to category range"),
buf, str);
err++;
continue;
Modified: grass/trunk/lib/vector/Vlib/cindex.c
===================================================================
--- grass/trunk/lib/vector/Vlib/cindex.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/cindex.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -104,8 +104,7 @@
check_status(Map);
if (index < 0 || index >= Map->plus.n_cidx)
- G_fatal_error(_
- ("Invalid layer index (index < 0 or index >= number of layers)"));
+ G_fatal_error(_("Invalid layer index (index < 0 or index >= number of layers)"));
return (Map->plus.cidx[index].n_ucats);
}
@@ -509,8 +508,7 @@
fp.file = G_fopen_old(buf, GV_CIDX_ELEMENT, Map->mapset);
if (fp.file == NULL) { /* category index file is not available */
- G_warning(_
- ("Unable to open category index file for vector map <%s@%s>"),
+ G_warning(_("Unable to open category index file for vector map <%s@%s>"),
Map->name, Map->mapset);
return -1;
}
Modified: grass/trunk/lib/vector/Vlib/field.c
===================================================================
--- grass/trunk/lib/vector/Vlib/field.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/field.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -91,8 +91,7 @@
}
if (Map->mode != GV_MODE_WRITE && Map->mode != GV_MODE_RW) {
- G_warning(_
- ("Unable to add database link, map is not opened in WRITE mode"));
+ G_warning(_("Unable to add database link, map is not opened in WRITE mode"));
return -1;
}
@@ -544,8 +543,7 @@
if (db_open_select_cursor
(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) {
/* neither FID nor ogc_fid nor ogr_fid nor gid available */
- G_warning(_
- ("All FID tests failed. Neither 'FID' nor 'ogc_fid' "
+ G_warning(_("All FID tests failed. Neither 'FID' nor 'ogc_fid' "
"nor 'ogr_fid' nor 'gid' available in OGR DB table"));
db_close_database_shutdown_driver(driver);
return 0;
@@ -773,8 +771,7 @@
void Vect_set_db_updated(struct Map_info *Map)
{
if (strcmp(Map->mapset, G_mapset()) != 0) {
- G_fatal_error(_
- ("Bug: attempt to update map which is not in current mapset"));
+ G_fatal_error(_("Bug: attempt to update map which is not in current mapset"));
}
Vect_write_dblinks(Map);
Modified: grass/trunk/lib/vector/Vlib/intersect.c
===================================================================
--- grass/trunk/lib/vector/Vlib/intersect.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/intersect.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -319,8 +319,7 @@
}
/* should not be reached */
- G_warning(_
- ("Vect_segment_intersection() ERROR (collinear vertical segments)"));
+ G_warning(_("Vect_segment_intersection() ERROR (collinear vertical segments)"));
G_warning("%.15g %.15g", ax1, ay1);
G_warning("%.15g %.15g", ax2, ay2);
G_warning("x");
@@ -446,8 +445,7 @@
}
/* should not be reached */
- G_warning(_
- ("Vect_segment_intersection() ERROR (collinear non vertical segments)"));
+ G_warning(_("Vect_segment_intersection() ERROR (collinear non vertical segments)"));
G_warning("%.15g %.15g", ax1, ay1);
G_warning("%.15g %.15g", ax2, ay2);
G_warning("x");
Modified: grass/trunk/lib/vector/Vlib/legal_vname.c
===================================================================
--- grass/trunk/lib/vector/Vlib/legal_vname.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/legal_vname.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -45,16 +45,14 @@
sprintf(buf, "%s", s);
if (*s == '.' || *s == 0) {
- G_warning(_
- ("Illegal vector map name <%s>. May not contain '.' or 'NULL'."),
+ G_warning(_("Illegal vector map name <%s>. May not contain '.' or 'NULL'."),
buf);
return -1;
}
/* file name must start with letter */
if (!((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z'))) {
- G_warning(_
- ("Illegal vector map name <%s>. Must start with a letter."),
+ G_warning(_("Illegal vector map name <%s>. Must start with a letter."),
buf);
return -1;
}
@@ -62,16 +60,14 @@
for (s++; *s; s++)
if (!((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z') ||
(*s >= '0' && *s <= '9') || *s == '_' || *s == '@')) {
- G_warning(_
- ("Illegal vector map name <%s>. Character '%c' not allowed."),
+ G_warning(_("Illegal vector map name <%s>. Character '%c' not allowed."),
buf, *s);
return -1;
}
for (i = 0; keywords[i]; i++)
if (G_strcasecmp(buf, keywords[i]) == 0) {
- G_warning(_
- ("Illegal vector map name <%s>. SQL keyword cannot be used as vector map name."),
+ G_warning(_("Illegal vector map name <%s>. SQL keyword cannot be used as vector map name."),
buf);
return -1;
}
@@ -102,8 +98,7 @@
if (Vect_legal_filename(output) == -1) {
if (error == GV_FATAL_EXIT) {
- G_fatal_error(_
- ("Output vector map name <%s> is not valid map name"),
+ G_fatal_error(_("Output vector map name <%s> is not valid map name"),
output);
}
else if (error == GV_FATAL_PRINT) {
Modified: grass/trunk/lib/vector/Vlib/map.c
===================================================================
--- grass/trunk/lib/vector/Vlib/map.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/map.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -263,8 +263,7 @@
}
else {
if (db_create_index2(driver, Fin->table, Fi->key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fi->table, Fi->key);
db_close_database_shutdown_driver(driver);
@@ -399,8 +398,7 @@
}
else {
if (db_create_index2(driver, Fout->table, Fin->key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fout->table, Fout->key);
db_close_database_shutdown_driver(driver);
@@ -460,8 +458,7 @@
for (i = 0; i < n; i++) {
Fi = Vect_get_dblink(&Map, i);
if (Fi == NULL) {
- G_warning(_
- ("Database connection not defined for layer %d"),
+ G_warning(_("Database connection not defined for layer %d"),
Map.dblnk->field[i].number);
Vect_close(&Map);
return -1;
@@ -471,8 +468,7 @@
ret = db_table_exists(Fi->driver, Fi->database, Fi->table);
if (ret == -1) {
- G_warning(_
- ("Unable to find table <%s> linked to vector map <%s>"),
+ G_warning(_("Unable to find table <%s> linked to vector map <%s>"),
Fi->table, map);
Vect_close(&Map);
return -1;
@@ -488,8 +484,7 @@
}
}
else {
- G_warning(_
- ("Table <%s> linked to vector map <%s> does not exist"),
+ G_warning(_("Table <%s> linked to vector map <%s> does not exist"),
Fi->table, map);
}
}
@@ -615,8 +610,7 @@
}
else {
if (db_create_index2(driver, Fin->table, Fi->key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fin->table, Fin->key);
db_close_database_shutdown_driver(driver);
Modified: grass/trunk/lib/vector/Vlib/net.c
===================================================================
--- grass/trunk/lib/vector/Vlib/net.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/net.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -193,8 +193,7 @@
fctype = db_sqltype_to_Ctype(db_get_column_sqltype(Column));
if (fctype != DB_C_TYPE_INT && fctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Data type of column <%s> not supported (must be numeric)"),
+ G_fatal_error(_("Data type of column <%s> not supported (must be numeric)"),
afcol);
db_CatValArray_init(&fvarr);
@@ -211,8 +210,7 @@
bctype = db_sqltype_to_Ctype(db_get_column_sqltype(Column));
if (bctype != DB_C_TYPE_INT && bctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Data type of column <%s> not supported (must be numeric)"),
+ G_fatal_error(_("Data type of column <%s> not supported (must be numeric)"),
abcol);
db_CatValArray_init(&bvarr);
@@ -365,8 +363,7 @@
fctype = db_sqltype_to_Ctype(db_get_column_sqltype(Column));
if (fctype != DB_C_TYPE_INT && fctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Data type of column <%s> not supported (must be numeric)"),
+ G_fatal_error(_("Data type of column <%s> not supported (must be numeric)"),
ncol);
db_CatValArray_init(&fvarr);
@@ -402,8 +399,7 @@
&dcost);
}
if (ret != DB_OK) {
- G_warning(_
- ("Database record for node %d (cat = %d) not found "
+ G_warning(_("Database record for node %d (cat = %d) not found "
"(cost set to 0)"), i, cat);
}
cfound = 1;
Modified: grass/trunk/lib/vector/Vlib/open.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/open.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -176,8 +176,7 @@
Map->gisdbase = G_store(G_gisdbase());
if (update && (0 != strcmp(Map->mapset, G_mapset()))) {
- G_warning(_
- ("Vector map which is not in the current mapset cannot be opened for update"));
+ G_warning(_("Vector map which is not in the current mapset cannot be opened for update"));
return -1;
}
@@ -233,8 +232,7 @@
level = 1;
}
else if (ret == -1) {
- G_fatal_error(_
- ("Unable to open topology file for vector map <%s>"),
+ G_fatal_error(_("Unable to open topology file for vector map <%s>"),
Vect_get_full_name(Map));
}
/* open spatial index, not needed for head_only */
@@ -260,8 +258,7 @@
level = 1;
}
else if (ret == -1) { /* file exists, but cannot be opened */
- G_fatal_error(_
- ("Unable to open category index file for vector map <%s>"),
+ G_fatal_error(_("Unable to open category index file for vector map <%s>"),
Vect_get_full_name(Map));
}
}
@@ -728,8 +725,7 @@
/* do checks */
err = 0;
if (CInfo.size != Plus->coor_size) {
- G_warning(_
- ("Size of 'coor' file differs from value saved in topology file"));
+ G_warning(_("Size of 'coor' file differs from value saved in topology file"));
err = 1;
}
/* Do not check mtime because mtime is changed by copy */
Modified: grass/trunk/lib/vector/Vlib/open_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open_nat.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/open_nat.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -142,13 +142,11 @@
Map->head.size, CInfo.size);
if (dif > 0) {
- G_warning(_
- ("Coor files of vector map <%s@%s> is larger than it should be "
+ G_warning(_("Coor files of vector map <%s@%s> is larger than it should be "
"(%ld bytes excess)"), Map->name, Map->mapset, dif);
}
else if (dif < 0) {
- G_warning(_
- ("Coor files of vector <%s@%s> is shorter than it should be "
+ G_warning(_("Coor files of vector <%s@%s> is shorter than it should be "
"(%ld bytes missing)."), Map->name, Map->mapset, -dif);
}
return 1;
Modified: grass/trunk/lib/vector/Vlib/open_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open_ogr.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/open_ogr.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -144,14 +144,12 @@
/* check version numbers */
if (Version_Major > 5 || Version_Minor > 0) {
if (Back_Major > 5 || Back_Minor > 0) {
- G_fatal_error(_
- ("Feature index format version %d.%d is not supported by this release."
+ G_fatal_error(_("Feature index format version %d.%d is not supported by this release."
" Try to rebuild topology or upgrade GRASS."),
Version_Major, Version_Minor);
return (-1);
}
- G_warning(_
- ("Your GRASS version does not fully support feature index format %d.%d of the vector."
+ G_warning(_("Your GRASS version does not fully support feature index format %d.%d of the vector."
" Consider to rebuild topology or upgrade GRASS."),
Version_Major, Version_Minor);
}
Modified: grass/trunk/lib/vector/Vlib/overlay.c
===================================================================
--- grass/trunk/lib/vector/Vlib/overlay.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/overlay.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -120,12 +120,10 @@
/* TODO: support all types; at present only point x point, area x point and point x area supported */
if ((atype & GV_LINES) || (btype & GV_LINES))
- G_warning(_
- ("Overlay: line/boundary types not supported by AND operator"));
+ G_warning(_("Overlay: line/boundary types not supported by AND operator"));
if ((atype & GV_AREA) && (btype & GV_AREA))
- G_warning(_
- ("Overlay: area x area types not supported by AND operator"));
+ G_warning(_("Overlay: area x area types not supported by AND operator"));
/* TODO: more points in one node in one map */
Modified: grass/trunk/lib/vector/Vlib/read.c
===================================================================
--- grass/trunk/lib/vector/Vlib/read.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/read.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -103,8 +103,7 @@
G_fatal_error("Vect_read_line(): %s", _("vector map is not opened"));
if (line < 1 || line > Map->plus.n_lines)
- G_fatal_error(_
- ("Vect_read_line(): line %d is not reasonable (max line in vector map: %d)"),
+ G_fatal_error(_("Vect_read_line(): line %d is not reasonable (max line in vector map: %d)"),
line, Map->plus.n_lines);
return (*V2_read_line_array[Map->format]) (Map, line_p, line_c, line);
Modified: grass/trunk/lib/vector/Vlib/read_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/read_ogr.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/read_ogr.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -375,8 +375,7 @@
Map->fInfo.ogr.feature_cache =
OGR_L_GetFeature(Map->fInfo.ogr.layer, FID);
if (Map->fInfo.ogr.feature_cache == NULL) {
- G_fatal_error(_
- ("Unable to get feature geometry, FID %ld"),
+ G_fatal_error(_("Unable to get feature geometry, FID %ld"),
FID);
}
Map->fInfo.ogr.feature_cache_id = FID;
Modified: grass/trunk/lib/vector/Vlib/sindex.c
===================================================================
--- grass/trunk/lib/vector/Vlib/sindex.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/sindex.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -166,8 +166,7 @@
Node = plus->Node[i];
if (!Node)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): node does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): node does not exist"));
dig_spidx_add_node(plus, i, Node->x, Node->y, Node->z);
}
@@ -179,8 +178,7 @@
Line = plus->Line[i];
if (!Line)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): line does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): line does not exist"));
box.N = Line->N;
box.S = Line->S;
@@ -199,8 +197,7 @@
Area = plus->Area[i];
if (!Area)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): area does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): area does not exist"));
box.N = Area->N;
box.S = Area->S;
@@ -219,8 +216,7 @@
Isle = plus->Isle[i];
if (!Isle)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): isle does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): isle does not exist"));
box.N = Isle->N;
box.S = Isle->S;
Modified: grass/trunk/lib/vector/Vlib/write_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/write_nat.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/Vlib/write_nat.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -36,8 +36,7 @@
Area = Map->plus.Area[area];
if (!Area)
- G_fatal_error(_
- ("BUG (delete_area_cats_from_cidx): Area %d does not exist"),
+ G_fatal_error(_("BUG (delete_area_cats_from_cidx): Area %d does not exist"),
area);
if (Area->centroid == 0)
@@ -64,8 +63,7 @@
Area = Map->plus.Area[area];
if (!Area)
- G_fatal_error(_
- ("BUG (add_area_cats_to_cidx): Area %d does not exist"),
+ G_fatal_error(_("BUG (add_area_cats_to_cidx): Area %d does not exist"),
area);
if (Area->centroid == 0)
Modified: grass/trunk/lib/vector/diglib/plus_area.c
===================================================================
--- grass/trunk/lib/vector/diglib/plus_area.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/diglib/plus_area.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -301,8 +301,7 @@
Area->n_isles--;
}
else {
- G_fatal_error(_
- ("Attempt to delete not registered isle %d from area %d"),
+ G_fatal_error(_("Attempt to delete not registered isle %d from area %d"),
isle, area);
}
@@ -380,8 +379,7 @@
if (line > 0) {
Line = plus->Line[line];
if (!Line) {
- G_warning(_
- ("Dead centroid %d registered for area (bug in the vector library)"),
+ G_warning(_("Dead centroid %d registered for area (bug in the vector library)"),
line);
}
else {
@@ -405,8 +403,7 @@
for (i = 0; i < Area->n_isles; i++) {
Isle = plus->Isle[Area->isles[i]];
if (Isle == NULL) {
- G_fatal_error(_
- ("Attempt to delete area %d info from dead isle %d"),
+ G_fatal_error(_("Attempt to delete area %d info from dead isle %d"),
area, Area->isles[i]);
}
else {
@@ -749,8 +746,7 @@
G_debug(3, " area outside isle = %d", Isle->area);
if (Isle->area > 0) {
if (plus->Area[Isle->area] == NULL) {
- G_fatal_error(_
- ("Attempt to delete isle %d info from dead area %d"),
+ G_fatal_error(_("Attempt to delete isle %d info from dead area %d"),
isle, Isle->area);
}
else {
Modified: grass/trunk/lib/vector/diglib/plus_node.c
===================================================================
--- grass/trunk/lib/vector/diglib/plus_node.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/diglib/plus_node.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -214,8 +214,7 @@
return (node->angles[i]);
}
- G_fatal_error(_
- ("Attempt to read line angle for the line which is not connected to the node: "
+ G_fatal_error(_("Attempt to read line angle for the line which is not connected to the node: "
"node %d, line %d"), nodeid, lineid);
return 0.0; /* not reached */
Modified: grass/trunk/lib/vector/vedit/cats.c
===================================================================
--- grass/trunk/lib/vector/vedit/cats.c 2008-08-06 21:50:17 UTC (rev 32584)
+++ grass/trunk/lib/vector/vedit/cats.c 2008-08-06 22:00:00 UTC (rev 32585)
@@ -71,8 +71,7 @@
}
else { /* delete old category */
if (Vect_field_cat_del(Cats, layer, cat) == 0) {
- G_warning(_
- ("Unable to delete layer/category %d/%d line %d"),
+ G_warning(_("Unable to delete layer/category %d/%d line %d"),
layer, cat, line);
}
else {
More information about the grass-commit
mailing list