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

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Aug 2 05:15:28 EDT 2009


Author: neteler
Date: 2009-08-02 05:15:27 -0400 (Sun, 02 Aug 2009)
New Revision: 38567

Modified:
   grass/branches/develbranch_6/vector/v.in.ogr/main.c
Log:
Juergen Fischer: osgeo4w fix 

Modified: grass/branches/develbranch_6/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ogr/main.c	2009-08-02 09:14:59 UTC (rev 38566)
+++ grass/branches/develbranch_6/vector/v.in.ogr/main.c	2009-08-02 09:15:27 UTC (rev 38567)
@@ -638,7 +638,7 @@
 		G_debug(3, "Ogr_ftype: %i", Ogr_ftype);	/* look up below */
 
 		if (i < ncnames - 1) {
-		    Ogr_fieldname = strdup(cnames_opt->answers[i + 1]);
+		    Ogr_fieldname = G_strdup(cnames_opt->answers[i + 1]);
 		}
 		else {
 		    /* Change column names to [A-Za-z][A-Za-z0-9_]* */
@@ -654,7 +654,7 @@
 		/* avoid that we get the 'cat' column twice */
 		if (strcmp(Ogr_fieldname, "cat") == 0) {
 		    sprintf(namebuf, "%s_", Ogr_fieldname);
-		    Ogr_fieldname = strdup(namebuf);
+		    Ogr_fieldname = G_strdup(namebuf);
 		}
 
 		/* captial column names are a pain in SQL */



More information about the grass-commit mailing list