[GRASS-SVN] r63010 - grass/branches/releasebranch_7_0/raster/r.in.ascii

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 03:00:09 -0800 (Wed, 26 Nov 2014)
New Revision: 63010

Modified:
   grass/branches/releasebranch_7_0/raster/r.in.ascii/main.c
Log:
r.in.ascii: use standardized options (#2409) - (merge r63009 from trunk)

Modified: grass/branches/releasebranch_7_0/raster/r.in.ascii/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.ascii/main.c	2014-11-26 10:54:20 UTC (rev 63009)
+++ grass/branches/releasebranch_7_0/raster/r.in.ascii/main.c	2014-11-26 11:00:09 UTC (rev 63010)
@@ -96,14 +96,14 @@
     parm.title->description = _("Title for resultant raster map");
 
     parm.mult = G_define_option();
-    parm.mult->key = "mult";
+    parm.mult->key = "multiplier";
     parm.mult->type = TYPE_DOUBLE;
     parm.mult->description = _("Default: read from header");
     parm.mult->required = NO;
     parm.mult->label = _("Multiplier for ASCII data");
 
     parm.nv = G_define_option();
-    parm.nv->key = "nv";
+    parm.nv->key = "null_value";
     parm.nv->type = TYPE_STRING;
     parm.nv->required = NO;
     parm.nv->multiple = NO;