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

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-13 06:48:20 -0800 (Sat, 13 Dec 2014)
New Revision: 63521

Modified:
   grass/trunk/lib/gis/parser.c
   grass/trunk/lib/gis/parser_dependencies.c
Log:
libgis: enclose options in <%s>
        debug messages cosmetics
        fix compilation warnings


Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c	2014-12-13 13:47:00 UTC (rev 63520)
+++ grass/trunk/lib/gis/parser.c	2014-12-13 14:48:20 UTC (rev 63521)
@@ -1560,7 +1560,7 @@
     else
         sep = G_store(option->answer);
     
-    G_debug(1, "G_option_to_separator(): key = %s -> sep = '%s'",
+    G_debug(2, "G_option_to_separator(): key = %s -> sep = '%s'",
 	    option->key, sep);
     
     return sep;

Modified: grass/trunk/lib/gis/parser_dependencies.c
===================================================================
--- grass/trunk/lib/gis/parser_dependencies.c	2014-12-13 13:47:00 UTC (rev 63520)
+++ grass/trunk/lib/gis/parser_dependencies.c	2014-12-13 14:48:20 UTC (rev 63521)
@@ -153,7 +153,7 @@
 	char *s0 = s;
 	char *ss = get_name(rule->opts[i]);
 	s = NULL;
-	G_asprintf(&s, "%s, %s", s0, ss);
+	G_asprintf(&s, "%s>, <%s", s0, ss);
 	G_free(s0);
 	G_free(ss);
     }
@@ -162,7 +162,7 @@
 	char *s0 = s;
 	char *ss = get_name(rule->opts[i]);
 	s = NULL;
-	G_asprintf(&s, disjunction ? _("%s or %s") : _("%s and %s"), s0, ss);
+	G_asprintf(&s, disjunction ? _("<%s> or <%s>") : _("<%s> and <%s>"), s0, ss);
 	G_free(s0);
 	G_free(ss);
     }
@@ -324,7 +324,7 @@
 
 void G__check_option_rules(void)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < rules.count; i++) {
 	const struct rule *rule = &((const struct rule *) rules.data)[i];
@@ -357,7 +357,7 @@
 
 void G__describe_option_rules(void)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < rules.count; i++) {
 	const struct rule *rule = &((const struct rule *) rules.data)[i];