[GRASS-SVN] r31148 - in grass/trunk: raster/r.buffer raster/r.carve
raster/r.clump raster/r.coin raster/r.colors
raster/r.compress raster/r.contour raster/r.cost
raster/r.covar raster/r.cross raster/r.describe
raster/r.distance raster/r.in.mat raster/r.kappa
raster/r.mfilter raster/r.mfilter.fp raster/r.neighbors
raster/r.out.mat raster/r.out.png raster/r.out.ppm
raster/r.out.ppm3 raster/r.out.tiff raster/r.patch
raster/r.random.surface raster/r.resample raster/r.rescale
raster/r.rescale.eq raster/r.series raster/r.slope.aspect
raster/r.texture raster/r.to.vect vector/v.kernel
vector/v.mkgrid vector/v.qcount vector/v.sample
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Apr 27 14:54:25 EDT 2008
Author: neteler
Date: 2008-04-27 14:54:24 -0400 (Sun, 27 Apr 2008)
New Revision: 31148
Modified:
grass/trunk/raster/r.buffer/main.c
grass/trunk/raster/r.carve/main.c
grass/trunk/raster/r.clump/main.c
grass/trunk/raster/r.coin/cmd_parms.c
grass/trunk/raster/r.colors/main.c
grass/trunk/raster/r.compress/main.c
grass/trunk/raster/r.contour/main.c
grass/trunk/raster/r.cost/main.c
grass/trunk/raster/r.covar/main.c
grass/trunk/raster/r.cross/main.c
grass/trunk/raster/r.describe/main.c
grass/trunk/raster/r.distance/parse.c
grass/trunk/raster/r.in.mat/main.c
grass/trunk/raster/r.kappa/main.c
grass/trunk/raster/r.mfilter.fp/main.c
grass/trunk/raster/r.mfilter/main.c
grass/trunk/raster/r.neighbors/main.c
grass/trunk/raster/r.out.mat/main.c
grass/trunk/raster/r.out.png/r.out.png.c
grass/trunk/raster/r.out.ppm/main.c
grass/trunk/raster/r.out.ppm3/main.c
grass/trunk/raster/r.out.tiff/r.out.tiff.c
grass/trunk/raster/r.patch/main.c
grass/trunk/raster/r.random.surface/init.c
grass/trunk/raster/r.resample/main.c
grass/trunk/raster/r.rescale.eq/main.c
grass/trunk/raster/r.rescale/main.c
grass/trunk/raster/r.series/main.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster/r.texture/main.c
grass/trunk/raster/r.to.vect/main.c
grass/trunk/vector/v.kernel/main.c
grass/trunk/vector/v.mkgrid/main.c
grass/trunk/vector/v.qcount/main.c
grass/trunk/vector/v.sample/main.c
Log:
removed superceded quiet flag stuff
Modified: grass/trunk/raster/r.buffer/main.c
===================================================================
--- grass/trunk/raster/r.buffer/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.buffer/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -45,10 +45,6 @@
struct Flag *flag2;
int ZEROFLAG;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
-
/* initialize GRASS */
G_gisinit(argv[0]);
@@ -83,22 +79,9 @@
flag2->key = 'z' ;
flag2->description = _("Ignore zero (0) data cells instead of NULL cells") ;
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
-
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
init_grass();
/* get input, output map names */
Modified: grass/trunk/raster/r.carve/main.c
===================================================================
--- grass/trunk/raster/r.carve/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.carve/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -65,10 +65,6 @@
struct Map_info outMap;
struct Cell_head win;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
-
/* start GIS engine */
G_gisinit(argv[0]);
@@ -107,23 +103,10 @@
noflat->key = 'n';
noflat->description = _("No flat areas allowed in flow direction");
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
-
/* parse options */
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
G_check_input_output_name(parm.inrast->answer, parm.outrast->answer, GR_FATAL_EXIT);
if (parm.outvect->answer)
Vect_check_input_output_name(parm.invect->answer,
Modified: grass/trunk/raster/r.clump/main.c
===================================================================
--- grass/trunk/raster/r.clump/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.clump/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -39,15 +39,12 @@
struct Option *opt2 ;
struct Option *opt3 ;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag ;
-
G_gisinit (argv[0]);
/* Define the different options */
- module = G_define_module();
- module->keywords = _("raster");
+ module = G_define_module();
+ module->keywords = _("raster");
module->description =
_("Recategorizes data in a raster map layer by grouping cells "
"that form physically discrete areas into unique categories.");
@@ -63,22 +60,10 @@
opt3->required = NO;
opt3->description= _("Title, in quotes");
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
/* parse options */
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
INPUT = opt1->answer;
OUTPUT = opt2->answer;
Modified: grass/trunk/raster/r.coin/cmd_parms.c
===================================================================
--- grass/trunk/raster/r.coin/cmd_parms.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.coin/cmd_parms.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -35,9 +35,6 @@
struct Flag *w;
} flag;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
module = G_define_module();
module->keywords = _("raster");
module->description =
@@ -72,23 +69,9 @@
flag.w->key = 'w';
flag.w->description = _("Wide report, 132 columns (default: 80)");
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
strcpy (map1name, parm.map1->answer);
strcpy (map2name, parm.map2->answer);
mapset1 = G_find_cell2 (map1name, "");
Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.colors/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -112,7 +112,7 @@
int fp;
struct GModule *module;
struct {
- struct Flag *r, *w, *l, *g, *e, *i, *q, *n;
+ struct Flag *r, *w, *l, *g, *e, *i, *n;
} flag;
struct {
struct Option *map, *colr, *rast, *rules;
@@ -215,23 +215,9 @@
flag.i->key = 'i';
flag.i->description = _("Enter rules interactively");
- /* please, remove before GRASS 7 released */
- flag.q = G_define_flag();
- flag.q->key = 'q';
- flag.q->description = _("Run quietly");
-
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if (flag.q->answer)
- {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
if (flag.l->answer)
{
list_rules();
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.compress/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -54,13 +54,10 @@
struct Option *map;
struct Flag *uncompress;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
G_gisinit (argv[0]);
- module = G_define_module();
- module->keywords = _("raster");
+ module = G_define_module();
+ module->keywords = _("raster");
module->description =
_("Compresses and decompresses raster maps.");
@@ -76,21 +73,9 @@
uncompress->key = 'u';
uncompress->description = _("Uncompress the map");
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
if (G_parser(argc,argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
stat = 0;
for (n = 0; (name = map->answers[n]); n++)
if (process (name, uncompress->answer))
Modified: grass/trunk/raster/r.contour/main.c
===================================================================
--- grass/trunk/raster/r.contour/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.contour/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -79,11 +79,6 @@
char buf[2000];
dbString sql;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
- struct Flag *n_flag;
-
-
G_gisinit (argv[0]);
module = G_define_module();
@@ -92,7 +87,6 @@
"contours from a raster map layer.");
map = G_define_standard_option(G_OPT_R_INPUT);
-
vect = G_define_standard_option(G_OPT_V_OUTPUT);
levels=G_define_option () ;
@@ -127,25 +121,9 @@
cut->answer = "0";
cut->description= _("Minimum number of points for a contour line (0 -> no limit)") ;
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
- n_flag = G_define_flag() ;
- n_flag->key = 'n' ;
- n_flag->description = _("Suppress single crossing error messages") ;
-
-
if (G_parser(argc, argv))
exit (EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer || n_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' and '-n' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
if (!levels->answers && !step->answer) {
G_fatal_error(_("Neither \"levels\" nor \"step\" parameter specified."));
}
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.cost/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -114,9 +114,6 @@
double peak = 0.0;
int dsize;
- /* please, remove before GRASS 7 released */
- struct Flag *v_flag;
-
G_gisinit(argv[0]);
module = G_define_module();
@@ -210,34 +207,19 @@
flag4->key = 'r';
flag4->description = _("Start with values in raster map");
- /* please, remove before GRASS 7 released */
- v_flag = G_define_flag() ;
- v_flag->key = 'v' ;
- v_flag->description = _("Run verbosely") ;
-
/* Parse command line */
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(v_flag->answer) {
- G_putenv("GRASS_VERBOSE","2");
- G_warning(_("The '-v' flag is superseded and will be removed "
- "in future. Please use '--verbose' instead."));
- }
-
/* Initalize access to database and create temporary files */
-
in_file = G_tempfile();
out_file = G_tempfile();
/* Get database window parameters */
-
if (G_get_window(&window) < 0)
G_fatal_error(_("Unable to read current window parameters"));
/* Find north-south, east_west and diagonal factors */
-
EW_fac = 1.0;
NS_fac = window.ns_res / window.ew_res;
DIAG_fac = (double)sqrt((double)(NS_fac * NS_fac + EW_fac * EW_fac));
Modified: grass/trunk/raster/r.covar/main.c
===================================================================
--- grass/trunk/raster/r.covar/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.covar/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -43,13 +43,10 @@
struct Flag *r;
} flag;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
G_gisinit (argv[0]);
- module = G_define_module();
- module->keywords = _("raster");
+ module = G_define_module();
+ module->keywords = _("raster");
module->description =
_("Outputs a covariance/correlation matrix "
"for user-specified raster map layer(s).");
@@ -60,21 +57,9 @@
flag.r->key = 'r';
flag.r->description = _("Print correlation matrix");
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
/* flags */
correlation = flag.r->answer;
Modified: grass/trunk/raster/r.cross/main.c
===================================================================
--- grass/trunk/raster/r.cross/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.cross/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -54,15 +54,12 @@
struct Flag *z;
} flag;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
G_gisinit (argv[0]);
/* Define the different options */
- module = G_define_module();
- module->keywords = _("raster");
+ module = G_define_module();
+ module->keywords = _("raster");
module->description =
_("Creates a cross product of the category values from "
"multiple raster map layers.");
@@ -84,27 +81,13 @@
flag.z->key = 'z' ;
flag.z->description = _("Non-zero data only") ;
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
if (G_parser(argc, argv))
exit (EXIT_FAILURE);
- if(q_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
nrows = G_window_rows();
ncols = G_window_cols();
nfiles = 0;
- non_zero = 0;
-
-
non_zero = flag.z->answer;
for (nfiles = 0; (name = parm.input->answers[nfiles]); nfiles++)
Modified: grass/trunk/raster/r.describe/main.c
===================================================================
--- grass/trunk/raster/r.describe/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.describe/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -49,9 +49,6 @@
struct Option *nsteps;
} option;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
G_gisinit (argv[0]);
module = G_define_module();
@@ -100,21 +97,9 @@
flag.i->key = 'i';
flag.i->description = _("Read fp map as integer");
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
if (0 > G_parser(argc,argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
compact = (! flag.one->answer);
range = flag.r->answer;
windowed = flag.d->answer;
Modified: grass/trunk/raster/r.distance/parse.c
===================================================================
--- grass/trunk/raster/r.distance/parse.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.distance/parse.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -28,9 +28,6 @@
struct Flag *labels, *overlap;
char *name, *mapset;
- /* please, remove before GRASS 7 released */
- struct Flag *q_flag;
-
maps = G_define_option();
maps->key = "maps";
@@ -57,21 +54,9 @@
overlap -> key = 'o';
overlap->description = _("Report zero distance if rasters are overlapping");
- /* please, remove before GRASS 7 released */
- q_flag = G_define_flag() ;
- q_flag->key = 'q' ;
- q_flag->description = _("Run quietly") ;
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q_flag->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
name = parms->map1.name = maps->answers[0];
mapset = parms->map1.mapset = G_find_cell (name, "");
if (mapset == NULL)
Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.in.mat/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -77,13 +77,11 @@
struct History history;
struct Option *inputfile, *outputfile;
- struct Flag *verbose; /* remove for GRASS 7 */
struct GModule *module;
int cf;
FILE *fp1;
-
G_gisinit(argv[0]);
module = G_define_module();
@@ -107,23 +105,9 @@
outputfile->gisprompt = "new,cell,raster" ;
outputfile->description= _("Name for the output raster map (override)");
- /* please, remove before GRASS 7 released */
- verbose = G_define_flag();
- verbose->key = 'v';
- verbose->description = _("Verbose mode");
-
-
if (G_parser(argc,argv))
exit(EXIT_FAILURE);
-
- /* remove for GRASS 7 */
- if(verbose->answer) {
- putenv("GRASS_VERBOSE=3");
- G_warning(_("The '-v' flag is superseded and will be removed "
- "in future. Please use '--verbose' instead."));
- }
-
/****** SETUP ****************************************************/
/* Check Endian State of Host Computer*/
if (G_is_little_endian())
Modified: grass/trunk/raster/r.kappa/main.c
===================================================================
--- grass/trunk/raster/r.kappa/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.kappa/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -40,7 +40,7 @@
} parms;
struct {
- struct Flag *n, *w, *q, *h;
+ struct Flag *n, *w, *h;
} flags;
G_gisinit(argv[0]);
@@ -76,11 +76,6 @@
flags.w->label = _("Wide report");
flags.w->description = _("132 columns (default: 80)");
-/* please, remove before GRASS 7 released */
- flags.q = G_define_flag();
- flags.q->key = 'q';
- flags.q->description = _("Quiet");
-
flags.h = G_define_flag();
flags.h->key = 'h';
flags.h->description = _("No header in the report");
@@ -107,13 +102,6 @@
title = parms.titles->answer;
-/* please, remove before GRASS 7 released */
- if(flags.q->answer) {
- G_putenv("GRASS_VERBOSE","0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead"));
- }
-
/* run r.stats to obtain statistics of map layers */
stats();
@@ -127,7 +115,7 @@
/* generate the error matrix, kappa and variance */
calc_kappa();
- return 0;
+ return EXIT_SUCCESS;
}
Modified: grass/trunk/raster/r.mfilter/main.c
===================================================================
--- grass/trunk/raster/r.mfilter/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.mfilter/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -34,8 +34,6 @@
char temp[300];
int i;
struct GModule *module;
- /* please, remove before GRASS 7 released */
- struct Flag *flag1 ;
struct Flag *flag2 ;
struct Option *opt1 ;
struct Option *opt2 ;
@@ -76,11 +74,6 @@
/* Define the different flags */
- /* please, remove before GRASS 7 released */
- flag1 = G_define_flag() ;
- flag1->key = 'q' ;
- flag1->description = _("Quiet") ;
-
/* this isn't implemented at all
flag3 = G_define_flag() ;
flag3->key = 'p' ;
@@ -94,13 +87,6 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag1->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead"));
- }
-
/*
preserve_edges = flag3->answer;
*/
Modified: grass/trunk/raster/r.mfilter.fp/main.c
===================================================================
--- grass/trunk/raster/r.mfilter.fp/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.mfilter.fp/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -41,8 +41,6 @@
char temp[300];
int i;
struct GModule *module;
- /* please, remove before GRASS 7 released */
- struct Flag *flag1 ;
struct Flag *flag2 ;
struct Option *opt1 ;
struct Option *opt2 ;
@@ -83,11 +81,6 @@
/* Define the different flags */
- /* please, remove before GRASS 7 released */
- flag1 = G_define_flag() ;
- flag1->key = 'q' ;
- flag1->description = _("Quiet") ;
-
/* this isn't implemented at all
flag3 = G_define_flag() ;
flag3->key = 'p' ;
@@ -101,13 +94,6 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag1->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead"));
- }
-
/*
preserve_edges = flag3->answer;
*/
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.neighbors/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -90,8 +90,7 @@
} parm;
struct
{
- /* please, remove before GRASS 7 released */
- struct Flag *quiet, *align, *circle;
+ struct Flag *align, *circle;
} flag;
DCELL *values; /* list of neighborhood values */
@@ -152,11 +151,6 @@
flag.align->key = 'a';
flag.align->description = _("Do not align output with the input");
- /* please, remove before GRASS 7 released */
- flag.quiet = G_define_flag();
- flag.quiet->key = 'q';
- flag.quiet->description = _("Run quietly");
-
flag.circle = G_define_flag();
flag.circle->key = 'c';
flag.circle->description = _("Use circular neighborhood");
@@ -270,13 +264,6 @@
if (out_fd < 0)
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag.quiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
if (flag.circle->answer)
circle_mask();
Modified: grass/trunk/raster/r.out.mat/main.c
===================================================================
--- grass/trunk/raster/r.out.mat/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.out.mat/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -47,8 +47,6 @@
RASTER_MAP_TYPE map_type;
struct Option *inputfile, *outputfile;
- /* please, remove before GRASS 7 released */
- struct Flag *verbose;
struct GModule *module;
int fd;
@@ -73,24 +71,10 @@
outputfile->gisprompt = "new_file,file,output";
outputfile->description= _("Name for the output binary MAT-File");
- /* please, remove before GRASS 7 released */
- verbose = G_define_flag();
- verbose->key = 'v';
- verbose->description = _("Verbose mode");
-
if (G_parser(argc,argv))
exit(EXIT_FAILURE);
-
- /* please, remove before GRASS 7 released */
- if(verbose->answer) {
- putenv("GRASS_VERBOSE=3");
- G_warning(_("The '-v' flag is superseded and will be removed "
- "in future. Please use '--verbose' instead."));
- }
-
infile = inputfile->answer;
-
basename = G_store(outputfile->answer);
G_basename(basename, "mat");
outfile = G_malloc(strlen(basename) + 5);
Modified: grass/trunk/raster/r.out.png/r.out.png.c
===================================================================
--- grass/trunk/raster/r.out.png/r.out.png.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.out.png/r.out.png.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -49,8 +49,6 @@
{
struct GModule *module;
struct Option *rast, *png_file;
- /* please, remove before GRASS 7 released */
- struct Flag *bequiet;
char *cellmap, *map, *p, *basename = NULL, *ofile;
char rastermap[1024];
unsigned char *set, *ored, *ogrn, *oblu;
@@ -120,11 +118,6 @@
png_file->answer = "<rasterfilename>.png";
png_file->description = "Name for new PNG file. (use out=- for stdout)";
- /* please, remove before GRASS 7 released */
- bequiet = G_define_flag();
- bequiet->key = 'q';
- bequiet->description = "Run quietly";
-
/* see what can be done to convert'em -A.Sh.
* gscale = G_define_flag ();
* gscale->key = 'G';
@@ -139,14 +132,6 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(bequiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
strncpy(rastermap, rast->answer, 1024 * sizeof(char));
if (strcmp(png_file->answer, "<rasterfilename>.png")) {
Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.out.ppm/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -32,8 +32,7 @@
{
struct GModule *module;
struct Option *rast, *ppm_file;
- /* please, remove before GRASS 7 released */
- struct Flag *bequiet, *gscale;
+ struct Flag *gscale;
char *cellmap, *map, *p, ofile[1000];
unsigned char *set, *ored, *ogrn, *oblu;
CELL *cell_buf;
@@ -62,11 +61,6 @@
ppm_file->description
= _("Name for new PPM file (use '-' for stdout)");
- /* please, remove before GRASS 7 released */
- bequiet = G_define_flag ();
- bequiet->key = 'q';
- bequiet->description = _("Run quietly");
-
gscale = G_define_flag ();
gscale->key = 'G';
gscale->description = _("Output greyscale instead of color");
@@ -74,14 +68,6 @@
if (G_parser (argc, argv))
exit (EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(bequiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead"));
- }
-
-
/* kludge to work with r.out.mpeg */
if(rast->answer[0] == '/')
rast->answer++;
Modified: grass/trunk/raster/r.out.ppm3/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm3/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.out.ppm3/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -40,8 +40,7 @@
struct band B[3];
struct GModule *module;
struct Option *ppm_file;
- /* please, remove before GRASS 7 released */
- struct Flag *bequiet, *comment;
+ struct Flag *comment;
struct Cell_head w;
FILE *fp;
unsigned char *dummy;
@@ -80,11 +79,6 @@
ppm_file->answer = NULL;
ppm_file->description = _("Name for new PPM file. (use out=- for stdout)");
- /* please, remove before GRASS 7 released */
- bequiet = G_define_flag ();
- bequiet->key = 'q';
- bequiet->description = _("Run quietly");
-
comment = G_define_flag ();
comment->key = 'c';
comment->description = _("Add comments to describe the region");
@@ -92,14 +86,6 @@
if (G_parser (argc, argv))
exit (EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(bequiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
G_get_window (&w);
G_message(_("rows = %d, cols = %d"), w.rows, w.cols);
Modified: grass/trunk/raster/r.out.tiff/r.out.tiff.c
===================================================================
--- grass/trunk/raster/r.out.tiff/r.out.tiff.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.out.tiff/r.out.tiff.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -83,12 +83,11 @@
int in;
struct rasterfile h;
struct Option *inopt, *outopt, *compopt;
- struct Flag *pflag, *vflag, *lflag, *tflag;
+ struct Flag *pflag, *lflag, *tflag;
CELL *cell, *cellptr, *cells[MAX_TILE_LENGTH];
struct Cell_head cellhd;
struct GModule *module;
- /* please, remove before GRASS 7 released */
- int col,verbose, tfw, palette, tiled;
+ int col, tfw, palette, tiled;
char *mapset, *basename, *filename;
struct Colors colors;
int red, grn, blu, mapsize, isfp;
@@ -131,22 +130,9 @@
lflag->key = 'l';
lflag->description = _("Output Tiled TIFF");
- /* please, remove before GRASS 7 released */
- vflag = G_define_flag();
- vflag->key = 'v';
- vflag->description = _("Verbose mode");
-
if (G_parser (argc, argv))
exit (EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(vflag->answer) {
- putenv("GRASS_VERBOSE=3");
- G_warning(_("The '-v' flag is superseded and will be removed "
- "in future. Please use '--verbose' instead."));
- }
-
-
if (strncmp(compopt->answer, "packbit", 7) == 0)
compression = COMPRESSION_PACKBITS;
else if (strncmp(compopt->answer, "deflate", 7) == 0)
@@ -156,8 +142,6 @@
else
compression = COMPRESSION_NONE;
- /* please, remove before GRASS 7 released */
- verbose = vflag->answer;
tiled = lflag->answer;
palette = pflag->answer;
tfw = tflag->answer;
Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.patch/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -43,7 +43,6 @@
char **ptr;
struct GModule *module;
- struct Flag *flag1 ;
struct Flag *zeroflag;
struct Option *opt1, *opt2 ;
@@ -66,11 +65,6 @@
/* Define the different flags */
- /* please, remove before GRASS 7 released */
- flag1 = G_define_flag() ;
- flag1->key = 'q' ;
- flag1->description = _("Quiet") ;
-
zeroflag = G_define_flag() ;
zeroflag->key = 'z' ;
zeroflag->description = _("Use zero (0) for transparency instead of NULL") ;
@@ -80,14 +74,6 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag1->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
ZEROFLAG= (zeroflag->answer);
ok = 1;
Modified: grass/trunk/raster/r.random.surface/init.c
===================================================================
--- grass/trunk/raster/r.random.surface/init.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.random.surface/init.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -93,22 +93,9 @@
Uniform->key = 'u' ;
Uniform->description = "Uniformly distributed cell values" ;
- /* please, remove before GRASS 7 released */
- Verbose = G_define_flag() ;
- Verbose->key = 'q' ;
- Verbose->description = "No (quiet) description during run" ;
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(Verbose->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
Rs = G_window_rows();
Cs = G_window_cols();
Surface = (double **) G_malloc( Rs * sizeof( double *));
Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.resample/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -45,7 +45,6 @@
{
struct Option *input, *output;
} option ;
- struct Flag *flag1 ;
G_gisinit(argv[0]);
@@ -72,25 +71,12 @@
/* Define the different flags */
- /* please, remove before GRASS 7 released */
- flag1 = G_define_flag() ;
- flag1->key = 'q' ;
- flag1->description = _("Quiet");
-
if (G_parser(argc, argv))
exit (EXIT_FAILURE);
strcpy (name, option.input->answer);
strcpy (result, option.output->answer);
- /* please, remove before GRASS 7 released */
- if(flag1->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
mapset = G_find_cell2 (name, "");
if (mapset == NULL)
G_fatal_error ( _("Raster map <%s> not found"), name);
Modified: grass/trunk/raster/r.rescale/main.c
===================================================================
--- grass/trunk/raster/r.rescale/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.rescale/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -36,11 +36,6 @@
{
struct Option *input, *from, *output, *to, *title;
} parm;
- /* please, remove before GRASS 7 released */
- struct
- {
- struct Flag *quiet;
- } flag;
G_gisinit (argv[0]);
@@ -87,21 +82,9 @@
parm.title->required = NO;
parm.title->description= _("Title for new raster map") ;
- /* please, remove before GRASS 7 released */
- flag.quiet = G_define_flag();
- flag.quiet->key = 'q';
- flag.quiet->description = _("Quietly");
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag.quiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
old_name = parm.input->answer;
new_name = parm.output->answer;
Modified: grass/trunk/raster/r.rescale.eq/main.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.rescale.eq/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -37,11 +37,6 @@
struct Option *input, *from, *output, *to, *title;
} parm;
- /* please, remove before GRASS 7 released */
- struct
- {
- struct Flag *quiet;
- } flag;
struct GModule *module;
G_gisinit (argv[0]);
@@ -90,23 +85,10 @@
parm.title->required = NO;
parm.title->description= _("Title for new raster map") ;
- /* please, remove before GRASS 7 released */
- flag.quiet = G_define_flag();
- flag.quiet->key = 'q';
- flag.quiet->description = _("Quiet");
-
G_disable_interactive();
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag.quiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
old_name = parm.input->answer;
new_name = parm.output->answer;
Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.series/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -82,8 +82,6 @@
struct Option *input, *output, *method;
} parm;
struct {
- /* please, remove before GRASS 7 released */
- struct Flag *quiet;
struct Flag *nulls;
} flag;
int method;
@@ -119,11 +117,6 @@
parm.method->options = build_method_list();
parm.method->description= _("Aggregate operation") ;
- /* please, remove before GRASS 7 released */
- flag.quiet = G_define_flag();
- flag.quiet->key = 'q';
- flag.quiet->description = _("Run quietly");
-
flag.nulls = G_define_flag();
flag.nulls->key = 'n';
flag.nulls->description = _("Propagate NULLs");
@@ -131,13 +124,6 @@
if (G_parser(argc,argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag.quiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
/* get the method */
method = -1;
for (i = 0; menu[i].name; i++)
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.slope.aspect/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -142,8 +142,6 @@
struct
{
struct Flag *a;
- /* please, remove before GRASS 7 released */
- struct Flag *q;
} flag;
G_gisinit (argv[0]);
@@ -275,11 +273,6 @@
parm.min_slp_allowed->answer = "0.0";
parm.min_slp_allowed->guisection = _("Settings");
- /* please, remove before GRASS 7 released */
- flag.q = G_define_flag() ;
- flag.q->key = 'q' ;
- flag.q->description = _("Quiet") ;
-
flag.a = G_define_flag() ;
flag.a->key = 'a' ;
flag.a->description = _("Do not align the current region to the elevation layer") ;
@@ -313,15 +306,6 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(flag.q->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
-
elev_name = parm.elevation->answer;
slope_name = parm.slope->answer;
aspect_name = parm.aspect->answer;
Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.texture/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -62,7 +62,7 @@
RASTER_MAP_TYPE data_type, out_data_type;
struct GModule *module;
struct Option *input, *output, *size_O, *dist_O;
- struct Flag *flag1, *flag2, *flag3, *flag4, *flag5,
+ struct Flag *flag2, *flag3, *flag4, *flag5,
*flag6, *flag7, *flag8, *flag9, *flag10, *flag11,
*flag12, *flag13, *flag14, *flag15;
G_gisinit(argv[0]);
@@ -102,10 +102,6 @@
dist_O->answer = "1";
/* Define the different flags */
- /* please remove before GRASS 7 */
- flag1 = G_define_flag() ;
- flag1->key = 'q' ;
- flag1->description = _("Quiet") ;
/* "Normalized" unused in the code ???
flag0 = G_define_flag() ;
@@ -190,7 +186,6 @@
name = input->answer;
result = output->answer;
- verbose = (! flag1->answer);
a = (! flag2->answer);
c = (! flag3->answer);
corr = (! flag4->answer);
@@ -211,13 +206,6 @@
if (a && c && corr && v && idm && sa && sv && se && e && dv && de && moc1 && moc2 && mcc)
G_fatal_error(_("Nothing to compute. Use at least one of the flags."));
- /* please, remove before GRASS 7 released */
- if(flag1->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
/* find map in mapset */
mapset = G_find_cell2 (name, "");
if (mapset == NULL)
Modified: grass/trunk/raster/r.to.vect/main.c
===================================================================
--- grass/trunk/raster/r.to.vect/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/raster/r.to.vect/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -38,7 +38,7 @@
{
struct GModule *module;
struct Option *in_opt, *out_opt, *feature_opt;
- struct Flag *smooth_flg, *value_flg, *z_flg,*quiet, *no_topol;
+ struct Flag *smooth_flg, *value_flg, *z_flg, *no_topol;
char *mapset;
int feature;
@@ -81,22 +81,9 @@
no_topol->description =
_("Do not build vector topology (use with care for massive point export)");
- /* please, remove before GRASS 7 released */
- quiet = G_define_flag();
- quiet->key = 'q';
- quiet->description = _("Quiet - Do not show progress");
-
if (G_parser (argc, argv))
exit(EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(quiet->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
feature = Vect_option_to_types ( feature_opt );
smooth_flag = (smooth_flg->answer) ? SMOOTH : NO_SMOOTH;
value_flag = value_flg->answer;
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/vector/v.kernel/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -63,7 +63,7 @@
{
struct Option *in_opt, *net_opt, *out_opt;
struct Option *stddev_opt, *dsize_opt, *segmax_opt, *netmax_opt, *multip_opt;
- struct Flag *flag_o, *flag_v, *flag_q;
+ struct Flag *flag_o, *flag_q;
char *mapset;
struct Map_info In, Net, Out;
@@ -150,11 +150,6 @@
flag_q->key = 'q';
flag_q->description = _("Only calculate optimal standard deviation and exit (no map is written)");
- /* please, remove before GRASS 7 released */
- flag_v = G_define_flag();
- flag_v->key = 'v';
- flag_v->description = _("Run verbosely");
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
@@ -165,14 +160,6 @@
netmax = atof(netmax_opt->answer);
multip = atof(multip_opt->answer);
- /* please, remove before GRASS 7 released */
- if(flag_v->answer) {
- putenv("GRASS_VERBOSE=3");
- G_warning(_("The '-v' flag is superseded and will be removed "
- "in future. Please use '--verbose' instead."));
- }
-
-
if( flag_q->answer ) {
flag_o->answer=1;
}
Modified: grass/trunk/vector/v.mkgrid/main.c
===================================================================
--- grass/trunk/vector/v.mkgrid/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/vector/v.mkgrid/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -44,7 +44,6 @@
struct Cell_head window;
struct Map_info Map;
struct Option *vectname, *grid, *coord, *box, *angle, *position_opt;
- struct Flag *q;
struct GModule *module;
struct line_pnts *Points;
@@ -107,23 +106,9 @@
angle->description = _("Angle of rotation (in degrees counter-clockwise)");
angle->answer = "0";
- /* please, remove before GRASS 7 released */
- q = G_define_flag ();
- q->key = 'q';
- q->description = _("Quiet; No chatter");
- q->answer = 0;
-
if (G_parser (argc, argv))
exit (EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if(q->answer) {
- putenv("GRASS_VERBOSE=0");
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
-
/* get the current window */
G_get_window (&window);
Modified: grass/trunk/vector/v.qcount/main.c
===================================================================
--- grass/trunk/vector/v.qcount/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/vector/v.qcount/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -55,7 +55,6 @@
} parm;
struct
{
- struct Flag *q;
struct Flag *g;
} flag;
COOR *quads;
@@ -100,22 +99,9 @@
flag.g->key = 'g';
flag.g->description = _("Print results in shell script style");
-
- /* please, remove before GRASS 7 released */
- flag.q = G_define_flag ();
- flag.q->key = 'q';
- flag.q->description = "Quiet";
-
if (G_parser (argc, argv))
exit (EXIT_FAILURE);
- /* please, remove before GRASS 7 released */
- if (flag.q->answer) {
- G_set_verbose(G_verbose_min());
- G_warning(_("The '-q' flag is superseded and will be removed "
- "in future. Please use '--quiet' instead."));
- }
-
sscanf(parm.n->answer,"%d",&nquads);
sscanf(parm.r->answer,"%lf",&radius);
Modified: grass/trunk/vector/v.sample/main.c
===================================================================
--- grass/trunk/vector/v.sample/main.c 2008-04-27 16:39:51 UTC (rev 31147)
+++ grass/trunk/vector/v.sample/main.c 2008-04-27 18:54:24 UTC (rev 31148)
@@ -63,7 +63,7 @@
} parm;
struct
{
- struct Flag *B, *C, *q;
+ struct Flag *B, *C;
} flag;
int line, nlines;
@@ -122,11 +122,6 @@
flag.C->description =
_("Cubic convolution interpolation (default is nearest neighbor)");
- /* please, remove before GRASS 7 released */
- flag.q = G_define_flag();
- flag.q->key = 'q';
- flag.q->description = _("Quiet");
-
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
@@ -215,9 +210,7 @@
if (db_grant_on_table(Driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK)
G_fatal_error(_("Unable to grant privileges on table <%s>"), Fi->table);
- if (flag.q->answer)
- G_message(_("Checking vector points..."));
-
+ G_message(_("Checking vector points..."));
Points = Vect_new_line_struct();
Cats = Vect_new_cats_struct();
More information about the grass-commit
mailing list