[GRASS-SVN] r30339 - grass/branches/releasebranch_6_3/lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Feb 24 17:54:42 EST 2008
Author: neteler
Date: 2008-02-24 17:54:42 -0500 (Sun, 24 Feb 2008)
New Revision: 30339
Modified:
grass/branches/releasebranch_6_3/lib/gis/get_row.c
grass/branches/releasebranch_6_3/lib/gis/open_misc.c
Log:
Don't free return values from G_find_* (merge from HEAD)
Modified: grass/branches/releasebranch_6_3/lib/gis/get_row.c
===================================================================
--- grass/branches/releasebranch_6_3/lib/gis/get_row.c 2008-02-24 22:52:34 UTC (rev 30338)
+++ grass/branches/releasebranch_6_3/lib/gis/get_row.c 2008-02-24 22:54:42 UTC (rev 30339)
@@ -879,8 +879,6 @@
fcb->null_file_exists = 0;
return -1;
}
-
- G_free(dummy);
null_fd = G_open_old_misc("cell_misc", NULL_FILE, name, mapset);
if (null_fd < 0)
Modified: grass/branches/releasebranch_6_3/lib/gis/open_misc.c
===================================================================
--- grass/branches/releasebranch_6_3/lib/gis/open_misc.c 2008-02-24 22:52:34 UTC (rev 30338)
+++ grass/branches/releasebranch_6_3/lib/gis/open_misc.c 2008-02-24 22:54:42 UTC (rev 30339)
@@ -56,7 +56,7 @@
}
if ((dummy = G_find_file2_misc (dir, element, name, mapset)) == NULL)
return -1;
- G_free (dummy);
+
G__file_name_misc (path, dir, element, name, mapset);
return open (path, 0);
More information about the grass-commit
mailing list