[GRASS-SVN] r49420 - in grass/trunk: doc/vector/v.example
imagery/i.pca include include/vect lib/gis lib/vector/Vlib
raster/r.carve raster/r.param.scale raster/r.slope.aspect
vector/v.buffer vector/v.build vector/v.build.polylines
vector/v.category vector/v.clean vector/v.drape
vector/v.extract vector/v.extrude vector/v.generalize
vector/v.hull vector/v.kernel vector/v.lidar.correction
vector/v.lidar.edgedetection vector/v.lidar.growing
vector/v.net vector/v.net.alloc vector/v.net.allpairs
vector/v.net.bridge vector/v.net.centrality
vector/v.net.components vector/v.net.connectivity
vector/v.net.distance vector/v.net.flow vector/v.net.iso
vector/v.net.path vector/v.net.salesman
vector/v.net.spanningtree vector/v.net.steiner
vector/v.net.timetable vector/v.net.visibility
vector/v.outlier vector/v.overlay vector/v.patch
vector/v.reclass vector/v.segment vector/v.select
vector/v.surf.bspline vector/v.surf.rst vector/v.to.3d
vector/v.to.points vector/v.transform vector/v.type
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Nov 29 06:08:36 EST 2011
Author: martinl
Date: 2011-11-29 03:08:36 -0800 (Tue, 29 Nov 2011)
New Revision: 49420
Modified:
grass/trunk/doc/vector/v.example/main.c
grass/trunk/imagery/i.pca/main.c
grass/trunk/include/gis.h
grass/trunk/include/vect/dig_defines.h
grass/trunk/lib/gis/legal_name.c
grass/trunk/lib/vector/Vlib/legal_vname.c
grass/trunk/raster/r.carve/main.c
grass/trunk/raster/r.param.scale/interface.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/vector/v.buffer/main.c
grass/trunk/vector/v.build.polylines/main.c
grass/trunk/vector/v.build/main.c
grass/trunk/vector/v.category/main.c
grass/trunk/vector/v.clean/main.c
grass/trunk/vector/v.drape/main.c
grass/trunk/vector/v.extract/main.c
grass/trunk/vector/v.extrude/main.c
grass/trunk/vector/v.generalize/main.c
grass/trunk/vector/v.hull/main.c
grass/trunk/vector/v.kernel/main.c
grass/trunk/vector/v.lidar.correction/main.c
grass/trunk/vector/v.lidar.edgedetection/main.c
grass/trunk/vector/v.lidar.growing/main.c
grass/trunk/vector/v.net.alloc/main.c
grass/trunk/vector/v.net.allpairs/main.c
grass/trunk/vector/v.net.bridge/main.c
grass/trunk/vector/v.net.centrality/main.c
grass/trunk/vector/v.net.components/main.c
grass/trunk/vector/v.net.connectivity/main.c
grass/trunk/vector/v.net.distance/main.c
grass/trunk/vector/v.net.flow/main.c
grass/trunk/vector/v.net.iso/main.c
grass/trunk/vector/v.net.path/main.c
grass/trunk/vector/v.net.salesman/main.c
grass/trunk/vector/v.net.spanningtree/main.c
grass/trunk/vector/v.net.steiner/main.c
grass/trunk/vector/v.net.timetable/main.c
grass/trunk/vector/v.net.visibility/main.c
grass/trunk/vector/v.net/main.c
grass/trunk/vector/v.outlier/main.c
grass/trunk/vector/v.overlay/main.c
grass/trunk/vector/v.patch/main.c
grass/trunk/vector/v.reclass/main.c
grass/trunk/vector/v.segment/main.c
grass/trunk/vector/v.select/main.c
grass/trunk/vector/v.surf.bspline/main.c
grass/trunk/vector/v.surf.rst/main.c
grass/trunk/vector/v.to.3d/main.c
grass/trunk/vector/v.to.points/main.c
grass/trunk/vector/v.transform/main.c
grass/trunk/vector/v.type/main.c
Log:
replace GR_FATAL_* (rasters), GV_FATAL_* (vectors) by G_FATAL_*
Modified: grass/trunk/doc/vector/v.example/main.c
===================================================================
--- grass/trunk/doc/vector/v.example/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/doc/vector/v.example/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -69,7 +69,7 @@
3) if input was found in current mapset, check if input != output.
lib/vector/Vlib/legal_vname.c
*/
- Vect_check_input_output_name(old->answer, new->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(old->answer, new->answer, G_FATAL_EXIT);
if ((mapset = (char *)G_find_vector2(old->answer, "")) == NULL)
G_fatal_error(_("Vector map <%s> not found"), old->answer);
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/imagery/i.pca/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -134,7 +134,7 @@
char tmpbuf[128];
sprintf(tmpbuf, "%s.%d", opt_out->answer, i + 1);
- G_check_input_output_name(opt_in->answers[i], tmpbuf, GR_FATAL_EXIT);
+ G_check_input_output_name(opt_in->answers[i], tmpbuf, G_FATAL_EXIT);
inp_fd[i] = Rast_open_old(opt_in->answers[i], "");
}
Modified: grass/trunk/include/gis.h
===================================================================
--- grass/trunk/include/gis.h 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/include/gis.h 2011-11-29 11:08:36 UTC (rev 49420)
@@ -246,10 +246,10 @@
#define DEFAULT_FG_COLOR "black"
#define DEFAULT_BG_COLOR "white"
-/* for raster maps */
-#define GR_FATAL_EXIT 0
-#define GR_FATAL_PRINT 1
-#define GR_FATAL_RETURN 2
+/* error codes */
+#define G_FATAL_EXIT 0
+#define G_FATAL_PRINT 1
+#define G_FATAL_RETURN 2
/* for vector maps */
/*!
Modified: grass/trunk/include/vect/dig_defines.h
===================================================================
--- grass/trunk/include/vect/dig_defines.h 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/include/vect/dig_defines.h 2011-11-29 11:08:36 UTC (rev 49420)
@@ -4,14 +4,6 @@
Defines for diglib (part of vector library)
*/
-/*! \brief Exit/print/return on error
-
- \todo To be moved to gislib
-*/
-#define GV_FATAL_EXIT 0
-#define GV_FATAL_PRINT 1
-#define GV_FATAL_RETURN 2
-
/*! \brief Name of vector directory */
#define GV_DIRECTORY "vector"
/*! \brief Format description, data location (OGR) */
Modified: grass/trunk/lib/gis/legal_name.c
===================================================================
--- grass/trunk/lib/gis/legal_name.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/lib/gis/legal_name.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -57,7 +57,7 @@
*
* \param input input map name
* \param output output map name
- * \param error error type: GR_FATAL_EXIT, GR_FATAL_PRINT, GR_FATAL_RETURN
+ * \param error error type: G_FATAL_EXIT, G_FATAL_PRINT, G_FATAL_RETURN
*
* \return 0 OK
* \return 1 error
@@ -70,16 +70,16 @@
if (output == NULL)
return 0; /* don't die on undefined parameters */
if (G_legal_filename(output) == -1) {
- if (error == GR_FATAL_EXIT) {
+ if (error == G_FATAL_EXIT) {
G_fatal_error(_("Output raster map name <%s> is not valid map name"),
output);
}
- else if (error == GR_FATAL_PRINT) {
+ else if (error == G_FATAL_PRINT) {
G_warning(_("Output raster map name <%s> is not valid map name"),
output);
return 1;
}
- else { /* GR_FATAL_RETURN */
+ else { /* G_FATAL_RETURN */
return 1;
}
}
@@ -87,14 +87,14 @@
mapset = G_find_raster2(input, "");
if (mapset == NULL) {
- if (error == GR_FATAL_EXIT) {
+ if (error == G_FATAL_EXIT) {
G_fatal_error(_("Raster map <%s> not found"), input);
}
- else if (error == GR_FATAL_PRINT) {
+ else if (error == G_FATAL_PRINT) {
G_warning(_("Raster map <%s> not found"), input);
return 1;
}
- else { /* GR_FATAL_RETURN */
+ else { /* G_FATAL_RETURN */
return 1;
}
}
@@ -111,16 +111,16 @@
}
if (strcmp(in, output) == 0) {
- if (error == GR_FATAL_EXIT) {
+ if (error == G_FATAL_EXIT) {
G_fatal_error(_("Output raster map <%s> is used as input"),
output);
}
- else if (error == GR_FATAL_PRINT) {
+ else if (error == G_FATAL_PRINT) {
G_warning(_("Output raster map <%s> is used as input"),
output);
return 1;
}
- else { /* GR_FATAL_RETURN */
+ else { /* G_FATAL_RETURN */
return 1;
}
}
Modified: grass/trunk/lib/vector/Vlib/legal_vname.c
===================================================================
--- grass/trunk/lib/vector/Vlib/legal_vname.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/lib/vector/Vlib/legal_vname.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -80,7 +80,7 @@
\param input input name
\param output output name
- \param error error type GV_FATAL_EXIT, GV_FATAL_PRINT, GV_FATAL_RETURN
+ \param error error type G_FATAL_EXIT, G_FATAL_PRINT, G_FATAL_RETURN
\return 0 OK
\return 1 error
@@ -93,11 +93,11 @@
char nm[GNAME_MAX], ms[GMAPSET_MAX];
if (Vect_legal_filename(output) == -1) {
- if (error == GV_FATAL_EXIT) {
+ if (error == G_FATAL_EXIT) {
G_fatal_error(_("Output vector map name <%s> is not valid map name"),
output);
}
- else if (error == GV_FATAL_PRINT) {
+ else if (error == G_FATAL_PRINT) {
G_warning(_("Output vector map name <%s> is not valid map name"),
output);
return 1;
@@ -117,10 +117,10 @@
mapset = G_find_vector2(input, "");
if (mapset == NULL) {
- if (error == GV_FATAL_EXIT) {
+ if (error == G_FATAL_EXIT) {
G_fatal_error(_("Vector map <%s> not found"), input);
}
- else if (error == GV_FATAL_PRINT) {
+ else if (error == G_FATAL_PRINT) {
G_warning(_("Vector map <%s> not found"), input);
return 1;
}
@@ -140,11 +140,11 @@
}
if (strcmp(in, output) == 0) {
- if (error == GV_FATAL_EXIT) {
+ if (error == G_FATAL_EXIT) {
G_fatal_error(_("Output vector map <%s> is used as input"),
output);
}
- else if (error == GV_FATAL_PRINT) {
+ else if (error == G_FATAL_PRINT) {
G_warning(_("Output vector map <%s> is used as input"),
output);
return 1;
Modified: grass/trunk/raster/r.carve/main.c
===================================================================
--- grass/trunk/raster/r.carve/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/raster/r.carve/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -114,10 +114,10 @@
exit(EXIT_FAILURE);
G_check_input_output_name(parm.inrast->answer, parm.outrast->answer,
- GR_FATAL_EXIT);
+ G_FATAL_EXIT);
if (parm.outvect->answer)
- Vect_check_input_output_name(parm.invect->answer,
- parm.outvect->answer, GR_FATAL_EXIT);
+ Vect_check_input_output_name(parm.invect->answer, parm.outvect->answer,
+ G_FATAL_EXIT);
/* setup lat/lon projection and distance calculations */
init_projection(&win, &parm.wrap);
Modified: grass/trunk/raster/r.param.scale/interface.c
===================================================================
--- grass/trunk/raster/r.param.scale/interface.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/raster/r.param.scale/interface.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -166,7 +166,7 @@
}
/* make sure input and output names are valid */
- G_check_input_output_name(rast_in_name, rast_out_name, GR_FATAL_EXIT);
+ G_check_input_output_name(rast_in_name, rast_out_name, G_FATAL_EXIT);
if ((wsize / 2 != (wsize - 1) / 2) || (wsize > MAX_WSIZE))
G_fatal_error(_("Inappropriate window size (too big or even)"));
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/raster/r.slope.aspect/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -299,15 +299,15 @@
dyy_name = parm.dyy->answer;
dxy_name = parm.dxy->answer;
- G_check_input_output_name(elev_name, slope_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, aspect_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, pcurv_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, tcurv_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, dx_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, dy_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, dxx_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, dyy_name, GR_FATAL_EXIT);
- G_check_input_output_name(elev_name, dxy_name, GR_FATAL_EXIT);
+ G_check_input_output_name(elev_name, slope_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, aspect_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, pcurv_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, tcurv_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, dx_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, dy_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, dxx_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, dyy_name, G_FATAL_EXIT);
+ G_check_input_output_name(elev_name, dxy_name, G_FATAL_EXIT);
if (sscanf(parm.zfactor->answer, "%lf", &zfactor) != 1 || zfactor <= 0.0) {
G_fatal_error(_("%s=%s - must be a positive number"),
Modified: grass/trunk/vector/v.buffer/main.c
===================================================================
--- grass/trunk/vector/v.buffer/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.buffer/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -298,6 +298,13 @@
"option or clean manually with v.clean tool=break; "
"v.category step=0; v.extract -d type=area"));
+ Vect_set_error_handler_io(&In, &Out);
+
+ Vect_check_input_output_name(in_opt->answer, out_opt->answer, G_FATAL_EXIT);
+
+ Vect_set_open_level(2); /* topology required */
+ Vect_open_old2(&In, in_opt->answer, "", field_opt->answer);
+
if (field_opt->answer)
field = Vect_get_field_number(&In, field_opt->answer);
else
@@ -335,23 +342,12 @@
G_verbose_message(_("The tolerance in map units = %g"), unit_tolerance);
}
- Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
-
+ Vect_open_new(&Out, out_opt->answer, WITHOUT_Z);
+
Points = Vect_new_line_struct();
Cats = Vect_new_cats_struct();
BCats = Vect_new_cats_struct();
-
- Vect_set_open_level(2); /* topology required */
-
- if (1 > Vect_open_old2(&In, in_opt->answer, "", field_opt->answer))
- G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer);
-
- if (0 > Vect_open_new(&Out, out_opt->answer, WITHOUT_Z)) {
- Vect_close(&In);
- G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer);
- }
-
+ G_fatal_error("x");
/* open tmp vector for buffers, needed for cleaning */
sprintf(bufname, "%s_tmp_%d", out_opt->answer, getpid());
if (0 > Vect_open_new(&Buf, bufname, 0)) {
Modified: grass/trunk/vector/v.build/main.c
===================================================================
--- grass/trunk/vector/v.build/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.build/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -80,7 +80,7 @@
}
if (err_opt->answer) {
Vect_check_input_output_name(map_opt->answer, err_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
}
/* build topology */
Modified: grass/trunk/vector/v.build.polylines/main.c
===================================================================
--- grass/trunk/vector/v.build.polylines/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.build.polylines/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -136,7 +136,7 @@
exit(EXIT_FAILURE);
Vect_check_input_output_name(input->answer, output->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
/* Open binary vector map at level 2 */
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.category/main.c
===================================================================
--- grass/trunk/vector/v.category/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.category/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -179,7 +179,7 @@
G_fatal_error(_("Output vector wasn't entered"));
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
}
Points = Vect_new_line_struct();
Modified: grass/trunk/vector/v.clean/main.c
===================================================================
--- grass/trunk/vector/v.clean/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.clean/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -135,10 +135,10 @@
otype = Vect_option_to_types(opt.type);
Vect_check_input_output_name(opt.in->answer, opt.out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
if (opt.err->answer) {
Vect_check_input_output_name(opt.in->answer, opt.err->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
}
atools = 20;
Modified: grass/trunk/vector/v.drape/main.c
===================================================================
--- grass/trunk/vector/v.drape/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.drape/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -214,7 +214,7 @@
/* check input/output vector maps */
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Vect_open_old2(&In, in_opt->answer, "", layer_opt->answer);
Modified: grass/trunk/vector/v.extract/main.c
===================================================================
--- grass/trunk/vector/v.extract/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.extract/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -170,7 +170,7 @@
input = opt.input->answer;
output = opt.output->answer;
Vect_check_input_output_name(input, output,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
if (flag.d->answer)
dissolve = TRUE;
Modified: grass/trunk/vector/v.extrude/main.c
===================================================================
--- grass/trunk/vector/v.extrude/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.extrude/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -142,7 +142,7 @@
centroid = 0;
/* set input vector map name and mapset */
- Vect_check_input_output_name(old->answer, new->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(old->answer, new->answer, G_FATAL_EXIT);
/* vector setup */
Points = Vect_new_line_struct();
Modified: grass/trunk/vector/v.generalize/main.c
===================================================================
--- grass/trunk/vector/v.generalize/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.generalize/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -285,7 +285,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.hull/main.c
===================================================================
--- grass/trunk/vector/v.hull/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.hull/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -74,7 +74,7 @@
sitefile = input->answer;
Vect_check_input_output_name(input->answer, output->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(1);
if (Vect_open_old2(&Map, sitefile, "", field->answer) < 0)
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.kernel/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -251,9 +251,9 @@
if (net_opt->answer) {
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_check_input_output_name(net_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
}
G_get_window(&window);
Modified: grass/trunk/vector/v.lidar.correction/main.c
===================================================================
--- grass/trunk/vector/v.lidar.correction/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.lidar.correction/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -171,7 +171,7 @@
/* Checking vector names */
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
/* Open input vector */
if ((mapset = G_find_vector2(in_opt->answer, "")) == NULL)
Modified: grass/trunk/vector/v.lidar.edgedetection/main.c
===================================================================
--- grass/trunk/vector/v.lidar.edgedetection/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.lidar.edgedetection/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -207,7 +207,7 @@
/* Checking vector names */
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
if ((mapset = G_find_vector2(in_opt->answer, "")) == NULL) {
G_fatal_error(_("Vector map <%s> not found"), in_opt->answer);
Modified: grass/trunk/vector/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/v.lidar.growing/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.lidar.growing/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -120,7 +120,7 @@
/* Open input vector */
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
if ((mapset = G_find_vector2(in_opt->answer, "")) == NULL) {
G_fatal_error(_("Vector map <%s> not found"), in_opt->answer);
Modified: grass/trunk/vector/v.net/main.c
===================================================================
--- grass/trunk/vector/v.net/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -74,7 +74,7 @@
if (act != TOOL_ARCS) {
/* check input-output */
Vect_check_input_output_name(opt.input->answer,
- opt.output->answer, GV_FATAL_EXIT);
+ opt.output->answer, G_FATAL_EXIT);
}
if (act == TOOL_CONNECT || act == TOOL_ARCS) {
Modified: grass/trunk/vector/v.net.alloc/main.c
===================================================================
--- grass/trunk/vector/v.net.alloc/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.alloc/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -120,7 +120,7 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- Vect_check_input_output_name(map->answer, output->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(map->answer, output->answer, G_FATAL_EXIT);
Cats = Vect_new_cats_struct();
Points = Vect_new_line_struct();
Modified: grass/trunk/vector/v.net.allpairs/main.c
===================================================================
--- grass/trunk/vector/v.net.allpairs/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.allpairs/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -119,7 +119,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.bridge/main.c
===================================================================
--- grass/trunk/vector/v.net.bridge/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.bridge/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -105,7 +105,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.centrality/main.c
===================================================================
--- grass/trunk/vector/v.net.centrality/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.centrality/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -201,7 +201,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.components/main.c
===================================================================
--- grass/trunk/vector/v.net.components/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.components/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -134,7 +134,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.connectivity/main.c
===================================================================
--- grass/trunk/vector/v.net.connectivity/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.connectivity/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -124,7 +124,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.distance/main.c
===================================================================
--- grass/trunk/vector/v.net.distance/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.distance/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -148,7 +148,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.flow/main.c
===================================================================
--- grass/trunk/vector/v.net.flow/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.flow/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -135,7 +135,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.iso/main.c
===================================================================
--- grass/trunk/vector/v.net.iso/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.iso/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -141,7 +141,7 @@
catlist = Vect_new_cat_list();
Vect_str_to_cat_list(term_opt->answer, catlist);
- Vect_check_input_output_name(map->answer, output->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(map->answer, output->answer, G_FATAL_EXIT);
/* Iso costs */
aiso = 1;
Modified: grass/trunk/vector/v.net.path/main.c
===================================================================
--- grass/trunk/vector/v.net.path/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.path/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -124,7 +124,7 @@
geo = 0;
Vect_check_input_output_name(input_opt->answer, output_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Vect_open_old(&In, input_opt->answer, "");
Modified: grass/trunk/vector/v.net.salesman/main.c
===================================================================
--- grass/trunk/vector/v.net.salesman/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.salesman/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -188,7 +188,7 @@
else
geo = 0;
- Vect_check_input_output_name(map->answer, output->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(map->answer, output->answer, G_FATAL_EXIT);
Vect_set_open_level(2);
Vect_open_old(&Map, map->answer, "");
Modified: grass/trunk/vector/v.net.spanningtree/main.c
===================================================================
--- grass/trunk/vector/v.net.spanningtree/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.spanningtree/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -93,7 +93,7 @@
Cats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.steiner/main.c
===================================================================
--- grass/trunk/vector/v.net.steiner/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.steiner/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -422,7 +422,7 @@
else
geo = 0;
- Vect_check_input_output_name(map->answer, output->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(map->answer, output->answer, G_FATAL_EXIT);
Vect_set_open_level(2);
Vect_open_old(&Map, map->answer, "");
Modified: grass/trunk/vector/v.net.timetable/main.c
===================================================================
--- grass/trunk/vector/v.net.timetable/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.timetable/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -346,7 +346,7 @@
Prev = Vect_new_line_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.net.visibility/main.c
===================================================================
--- grass/trunk/vector/v.net.visibility/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.net.visibility/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -70,7 +70,7 @@
exit(EXIT_FAILURE);
Vect_check_input_output_name(input->answer, output->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.outlier/main.c
===================================================================
--- grass/trunk/vector/v.outlier/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.outlier/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -146,7 +146,7 @@
/* Checking vector names */
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
if ((mapset = G_find_vector2(in_opt->answer, "")) == NULL) {
G_fatal_error(_("Vector map <%s> not found"), in_opt->answer);
Modified: grass/trunk/vector/v.overlay/main.c
===================================================================
--- grass/trunk/vector/v.overlay/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.overlay/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -155,9 +155,9 @@
operator_opt->answer);
Vect_check_input_output_name(in_opt[0]->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_check_input_output_name(in_opt[1]->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Points = Vect_new_line_struct();
Cats = Vect_new_cats_struct();
Modified: grass/trunk/vector/v.patch/main.c
===================================================================
--- grass/trunk/vector/v.patch/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.patch/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -110,7 +110,7 @@
i = 0;
while (old->answers[i]) {
in_name = old->answers[i++];
- Vect_check_input_output_name(in_name, new->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(in_name, new->answer, G_FATAL_EXIT);
Vect_set_open_level(2);
Vect_open_old_head(&InMap, in_name, "");
Modified: grass/trunk/vector/v.reclass/main.c
===================================================================
--- grass/trunk/vector/v.reclass/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.reclass/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -106,7 +106,7 @@
}
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Vect_open_old2(&In, in_opt->answer, "", field_opt->answer);
Modified: grass/trunk/vector/v.segment/main.c
===================================================================
--- grass/trunk/vector/v.segment/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.segment/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -79,7 +79,7 @@
PlPoints = Vect_new_line_struct();
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
if (strcmp(file_opt->answer, "-")) {
/* open input file */
Modified: grass/trunk/vector/v.select/main.c
===================================================================
--- grass/trunk/vector/v.select/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.select/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -90,7 +90,7 @@
itype[iopt] = Vect_option_to_types(parm.type[iopt]);
Vect_check_input_output_name(parm.input[iopt]->answer, parm.output->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Vect_set_open_level(2);
Vect_open_old2(&(In[iopt]), parm.input[iopt]->answer, "", parm.field[iopt]->answer);
Modified: grass/trunk/vector/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/v.surf.bspline/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.surf.bspline/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -315,7 +315,7 @@
"Try with a raster output or other driver."), dvr);
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
grid = FALSE;
if (0 > Vect_open_new(&Out, out_opt->answer, WITH_Z))
Modified: grass/trunk/vector/v.surf.rst/main.c
===================================================================
--- grass/trunk/vector/v.surf.rst/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.surf.rst/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -407,10 +407,10 @@
overfile);
}
/* if (treefile)
- Vect_check_input_output_name(input, treefile, GV_FATAL_EXIT);
+ Vect_check_input_output_name(input, treefile, G_FATAL_EXIT);
if (overfile)
- Vect_check_input_output_name(input, overfile, GV_FATAL_EXIT);
+ Vect_check_input_output_name(input, overfile, G_FATAL_EXIT);
*/
if ((elev == NULL) && (pcurv == NULL) && (tcurv == NULL)
&& (mcurv == NULL)
Modified: grass/trunk/vector/v.to.3d/main.c
===================================================================
--- grass/trunk/vector/v.to.3d/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.to.3d/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -65,7 +65,7 @@
}
Vect_check_input_output_name(opt.input->answer, opt.output->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
/* open input vector, topology not needed */
Vect_set_open_level(1);
Modified: grass/trunk/vector/v.to.points/main.c
===================================================================
--- grass/trunk/vector/v.to.points/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.to.points/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -237,7 +237,7 @@
vertex_type = 0;
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
/* Open input lines */
Vect_set_open_level(2);
Modified: grass/trunk/vector/v.transform/main.c
===================================================================
--- grass/trunk/vector/v.transform/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.transform/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -195,7 +195,7 @@
strcpy(Current.name, vold->answer);
strcpy(Trans.name, vnew->answer);
- Vect_check_input_output_name(vold->answer, vnew->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(vold->answer, vnew->answer, G_FATAL_EXIT);
if (!table->answer && columns->answer) {
G_fatal_error(_("Table name is not defined. Please use '%s' parameter."),
Modified: grass/trunk/vector/v.type/main.c
===================================================================
--- grass/trunk/vector/v.type/main.c 2011-11-29 11:05:53 UTC (rev 49419)
+++ grass/trunk/vector/v.type/main.c 2011-11-29 11:08:36 UTC (rev 49420)
@@ -63,7 +63,7 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- Vect_check_input_output_name(in_opt->answer, out_opt->answer, GV_FATAL_EXIT);
+ Vect_check_input_output_name(in_opt->answer, out_opt->answer, G_FATAL_EXIT);
switch (from_opt->answer[0]) {
case 'p':
@@ -115,7 +115,7 @@
G_fatal_error(_("Incompatible types"));
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
- GV_FATAL_EXIT);
+ G_FATAL_EXIT);
Points = Vect_new_line_struct();
Cats = Vect_new_cats_struct();
More information about the grass-commit
mailing list