[GRASS-SVN] r52764 - grass/branches/develbranch_6/vector/v.in.ogr

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Aug 20 05:04:27 PDT 2012


Author: mmetz
Date: 2012-08-20 05:04:27 -0700 (Mon, 20 Aug 2012)
New Revision: 52764

Modified:
   grass/branches/develbranch_6/vector/v.in.ogr/main.c
Log:
v.in.ogr change misleading var name

Modified: grass/branches/develbranch_6/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ogr/main.c	2012-08-20 11:47:53 UTC (rev 52763)
+++ grass/branches/develbranch_6/vector/v.in.ogr/main.c	2012-08-20 12:04:27 UTC (rev 52764)
@@ -638,7 +638,7 @@
 	/* Add DB link */
 	if (!notab_flag->answer) {
 	    char *cat_col_name = "cat";
-	    char *table_name;
+	    char *lname;
 
 	    if (nlayers == 1) {	/* one layer only */
 		Fi = Vect_default_field_info(&Map, layer + 1, NULL,
@@ -654,13 +654,13 @@
 	    }
 
 	    /* replace all spaces with underscore, otherwise dbln can't be read */
-	    table_name = G_store(layer_names[layer]);
-	    G_strip(table_name);
-	    G_strchg(table_name, ' ', '_');
+	    lname = G_store(layer_names[layer]);
+	    G_strip(lname);
+	    G_strchg(lname, ' ', '_');
 
-	    Vect_map_add_dblink(&Map, layer + 1, table_name, Fi->table,
+	    Vect_map_add_dblink(&Map, layer + 1, lname, Fi->table,
 				cat_col_name, Fi->database, Fi->driver);
-	    G_free(table_name);
+	    G_free(lname);
 
 	    ncols = OGR_FD_GetFieldCount(Ogr_featuredefn);
 	    G_debug(2, "%d columns", ncols);



More information about the grass-commit mailing list