[GRASS-SVN] r63844 - in grass/trunk: db/drivers/dbf raster/r.flow

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 11:07:57 -0800 (Mon, 29 Dec 2014)
New Revision: 63844

Modified:
   grass/trunk/db/drivers/dbf/table.c
   grass/trunk/raster/r.flow/io.c
Log:
update to r63843


Modified: grass/trunk/db/drivers/dbf/table.c
===================================================================
--- grass/trunk/db/drivers/dbf/table.c	2014-12-29 19:07:33 UTC (rev 63843)
+++ grass/trunk/db/drivers/dbf/table.c	2014-12-29 19:07:57 UTC (rev 63844)
@@ -235,7 +235,7 @@
 	return DB_OK;
 
     /* Construct our temp name because shapelib doesn't like '.' in name */
-    G__temp_element(element);
+    G_temp_element(element);
     sprintf(fname, "%d.dbf", getpid());
     G_file_name(name, element, fname, G_mapset());
     G_debug(2, "Write table to tempfile: '%s'", name);

Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c	2014-12-29 19:07:33 UTC (rev 63843)
+++ grass/trunk/raster/r.flow/io.c	2014-12-29 19:07:57 UTC (rev 63844)
@@ -47,7 +47,7 @@
     const char *location = G_location_path();
     const char *el = element;
 
-    G__temp_element(element);
+    G_temp_element(element);
     while (*fullname++ == *location++) ;
     while (*fullname++ == *mapset++) ;
     while (*fullname++ == *el++) ;
@@ -140,7 +140,7 @@
     const char *mapset;
 
     if (new == TEMP)
-	G__temp_element(string);
+	G_temp_element(string);
     else
 	sprintf(string, "cell_misc/%s", parm.elevin);