[GRASS-SVN] r63016 - in grass/branches/releasebranch_7_0: . db/db.select raster/r.describe

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Nov 26 03:27:28 PST 2014


Author: martinl
Date: 2014-11-26 03:27:28 -0800 (Wed, 26 Nov 2014)
New Revision: 63016

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/db/db.select/main.c
   grass/branches/releasebranch_7_0/raster/r.describe/main.c
Log:
use G_OPT_M_NULL_VALUE


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015

Modified: grass/branches/releasebranch_7_0/db/db.select/main.c
===================================================================
--- grass/branches/releasebranch_7_0/db/db.select/main.c	2014-11-26 11:27:03 UTC (rev 63015)
+++ grass/branches/releasebranch_7_0/db/db.select/main.c	2014-11-26 11:27:28 UTC (rev 63016)
@@ -232,11 +232,7 @@
     vs->answer = NULL;
     vs->guisection = _("Format");
 
-    nv = G_define_option();
-    nv->key = "nv";
-    nv->type = TYPE_STRING;
-    nv->required = NO;
-    nv->description = _("Null value indicator");
+    nv = G_define_standard_option(G_OPT_M_NULL_VALUE);
     nv->guisection = _("Format");
 
     output = G_define_standard_option(G_OPT_F_OUTPUT); 

Modified: grass/branches/releasebranch_7_0/raster/r.describe/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.describe/main.c	2014-11-26 11:27:03 UTC (rev 63015)
+++ grass/branches/releasebranch_7_0/raster/r.describe/main.c	2014-11-26 11:27:28 UTC (rev 63016)
@@ -59,13 +59,8 @@
     /* define different options */
     option.map = G_define_standard_option(G_OPT_R_MAP);
 
-    option.nv = G_define_option();
-    option.nv->key = "nv";
-    option.nv->type = TYPE_STRING;
-    option.nv->required = NO;
-    option.nv->multiple = NO;
+    option.nv = G_define_standard_option(G_OPT_M_NULL_VALUE);
     option.nv->answer = "*";
-    option.nv->description = _("String representing no data cell value");
 
     option.nsteps = G_define_option();
     option.nsteps->key = "nsteps";



More information about the grass-commit mailing list