[GRASS-SVN] r63560 - in grass/branches/releasebranch_7_0: . lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-15 14:30:08 -0800 (Mon, 15 Dec 2014)
New Revision: 63560

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/parser.c
   grass/branches/releasebranch_7_0/lib/gis/parser_dependencies.c
Log:
libgis: enclose options in <%s>
    debug messages cosmetics
    fix compilation warnings
    (merge r63521 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,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,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,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,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
 63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63307,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63524,63526,63536-63537,63551-63552,63554,63556
   + /grass/trunk:60817,61096,61141,61994,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,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,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,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
 63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63307,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521,63524,63526,63536-63537,63551-63552,63554,63556

Modified: grass/branches/releasebranch_7_0/lib/gis/parser.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser.c	2014-12-15 13:13:53 UTC (rev 63559)
+++ grass/branches/releasebranch_7_0/lib/gis/parser.c	2014-12-15 22:30:08 UTC (rev 63560)
@@ -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/branches/releasebranch_7_0/lib/gis/parser_dependencies.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_dependencies.c	2014-12-15 13:13:53 UTC (rev 63559)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_dependencies.c	2014-12-15 22:30:08 UTC (rev 63560)
@@ -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];