[GRASS-SVN] r53763 - grass/trunk/vector/v.hull

[svn_grass at osgeo.org]

Author: mmetz
Date: 2012-11-09 22:48:28 -0800 (Fri, 09 Nov 2012)
New Revision: 53763

Modified:
   grass/trunk/vector/v.hull/read.c
Log:
v.hull: fix cats parsing

Modified: grass/trunk/vector/v.hull/read.c
===================================================================
--- grass/trunk/vector/v.hull/read.c	2012-11-09 22:30:42 UTC (rev 53762)
+++ grass/trunk/vector/v.hull/read.c	2012-11-10 06:48:28 UTC (rev 53763)
@@ -82,7 +82,7 @@
 /* parse filter options */
 /* return cat list or NULL */
 struct cat_list *parse_filter_options(struct Map_info *Map, int layer,
-                      char *where, char *cats)
+                      char *where, char *catstr)
 {
     struct cat_list *list = NULL;
 
@@ -94,7 +94,7 @@
 	
 	if (layer < 1)
 	    G_fatal_error(_("'%s' must be > 0 for '%s'"), "layer", "where");
-	if (cats)
+	if (catstr)
 	    G_warning(_("'where' and 'cats' parameters were supplied, cat will be ignored"));
 
 	Fi = Vect_get_field(Map, layer);
@@ -139,15 +139,13 @@
 	
 	if (cats)
 	    G_free(cats);
-
-
     }
-    else if (cats) {
+    else if (catstr) {
 	if (layer < 1)
 	    G_fatal_error(_("'%s' must be > 0 for '%s'"), "layer", GV_KEY_COLUMN);
 	list = Vect_new_cat_list();
 
-	if (Vect_str_to_cat_list(cats, list) > 0) {
+	if (Vect_str_to_cat_list(catstr, list) > 0) {
 	    G_warning(_("Problem loading category values"));
 	}
     }