[GRASS-SVN] r63843 - in grass/trunk: include/defs lib/gis lib/init lib/vector/Vlib

[svn_grass at osgeo.org]

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

Modified:
   grass/trunk/include/defs/gis.h
   grass/trunk/lib/gis/tempfile.c
   grass/trunk/lib/init/clean_temp.c
   grass/trunk/lib/vector/Vlib/open.c
Log:
libgis: G__temp_element() -> G_temp_element()


Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h	2014-12-29 19:06:03 UTC (rev 63842)
+++ grass/trunk/include/defs/gis.h	2014-12-29 19:07:33 UTC (rev 63843)
@@ -657,7 +657,7 @@
 void G_init_tempfile(void);
 char *G_tempfile(void);
 char *G__tempfile(int);
-void G__temp_element(char *);
+void G_temp_element(char *);
 
 /* mkstemp.c */
 char *G_mktemp(char *);

Modified: grass/trunk/lib/gis/tempfile.c
===================================================================
--- grass/trunk/lib/gis/tempfile.c	2014-12-29 19:06:03 UTC (rev 63842)
+++ grass/trunk/lib/gis/tempfile.c	2014-12-29 19:07:33 UTC (rev 63843)
@@ -76,7 +76,7 @@
 
     if (pid <= 0)
 	pid = getpid();
-    G__temp_element(element);
+    G_temp_element(element);
     G_init_tempfile();
     do {
 	int uniq = G_counter_next(&unique);
@@ -93,7 +93,7 @@
  *
  * \param[out] element element name
  */
-void G__temp_element(char *element)
+void G_temp_element(char *element)
 {
     const char *machine;
 

Modified: grass/trunk/lib/init/clean_temp.c
===================================================================
--- grass/trunk/lib/init/clean_temp.c	2014-12-29 19:06:03 UTC (rev 63842)
+++ grass/trunk/lib/init/clean_temp.c	2014-12-29 19:07:33 UTC (rev 63843)
@@ -134,7 +134,7 @@
 	sscanf(argv[1], "%d", &ppid);
 
     /* Get the mapset temp directory */
-    G__temp_element(element);
+    G_temp_element(element);
     G_file_name(tmppath, element, "", mapset = G_mapset());
 
     /* get user id and current time in seconds */

Modified: grass/trunk/lib/vector/Vlib/open.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open.c	2014-12-29 19:06:03 UTC (rev 63842)
+++ grass/trunk/lib/vector/Vlib/open.c	2014-12-29 19:07:33 UTC (rev 63843)
@@ -1447,7 +1447,7 @@
     
     if (Map->temporary) {
         char path_tmp[GPATH_MAX];
-        G__temp_element(path_tmp);
+        G_temp_element(path_tmp);
         sprintf(path, "%s/%s/%s", path_tmp, GV_DIRECTORY, Map->name);
     }
     else {