소스 검색

libgis: enclose options in <%s>
debug messages cosmetics
fix compilation warnings


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63521 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 10 년 전
부모
커밋
4a28d19216
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      lib/gis/parser.c
  2. 4 4
      lib/gis/parser_dependencies.c

+ 1 - 1
lib/gis/parser.c

@@ -1560,7 +1560,7 @@ char* G_option_to_separator(const struct Option *option)
     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;

+ 4 - 4
lib/gis/parser_dependencies.c

@@ -153,7 +153,7 @@ static const char *describe_rule(const struct rule *rule, int start,
 	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 @@ static const char *describe_rule(const struct rule *rule, int start,
 	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 @@ static void check_collective(const struct rule *rule)
 
 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__check_option_rules(void)
 
 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];