[GRASS-SVN] r60873 - grass/trunk/lib/gis

[svn_grass at osgeo.org]

Author: hcho
Date: 2014-06-19 09:45:04 -0700 (Thu, 19 Jun 2014)
New Revision: 60873

Modified:
   grass/trunk/lib/gis/parser_dependencies.c
Log:
parser_dependencies.c: use get_name where needed

Modified: grass/trunk/lib/gis/parser_dependencies.c
===================================================================
--- grass/trunk/lib/gis/parser_dependencies.c	2014-06-19 16:04:47 UTC (rev 60872)
+++ grass/trunk/lib/gis/parser_dependencies.c	2014-06-19 16:45:04 UTC (rev 60873)
@@ -216,7 +216,7 @@
     if (!is_present(rule->opts[0]))
 	return;
     if (count_present(rule, 1) < 1)
-	G_fatal_error(_("Options %s requires at least one of %s"), describe_rule(rule, 0, 1));
+	G_fatal_error(_("Option %s requires at least one of %s"), get_name(rule->opts[0]), describe_rule(rule, 0, 1));
 }
 
 /* if the first option is present, all the other options must also
@@ -234,7 +234,7 @@
     if (!is_present(rule->opts[0]))
 	return;
     if (count_present(rule, 1) < rule->count - 1)
-	G_fatal_error(_("Options %s requires all of %s"), describe_rule(rule, 0, 0));
+	G_fatal_error(_("Option %s requires all of %s"), get_name(rule->opts[0]), describe_rule(rule, 0, 0));
 }
 
 /* if any option is present, all the other options must also be present
@@ -297,10 +297,10 @@
 	    fprintf(stderr, "Required: %s", describe_rule(rule, 0, 1));
 	    break;
 	case RULE_REQUIRES:
-	    fprintf(stderr, "Requires: %s => %s", rule->opts[0], describe_rule(rule, 1, 1));
+	    fprintf(stderr, "Requires: %s => %s", get_name(rule->opts[0]), describe_rule(rule, 1, 1));
 	    break;
 	case RULE_REQUIRES_ALL:
-	    fprintf(stderr, "Requires: %s => %s", rule->opts[0], describe_rule(rule, 1, 0));
+	    fprintf(stderr, "Requires: %s => %s", get_name(rule->opts[0]), describe_rule(rule, 1, 0));
 	    break;
 	case RULE_COLLECTIVE:
 	    fprintf(stderr, "Collective: %s", describe_rule(rule, 0, 0));