瀏覽代碼

libgis: G__temp_element() -> G_temp_element()
update modules
(merge r63843-4 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63845 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 10 年之前
父節點
當前提交
73b0f1b633
共有 6 個文件被更改,包括 8 次插入8 次删除
  1. 1 1
      db/drivers/dbf/table.c
  2. 1 1
      include/defs/gis.h
  3. 2 2
      lib/gis/tempfile.c
  4. 1 1
      lib/init/clean_temp.c
  5. 1 1
      lib/vector/Vlib/open.c
  6. 2 2
      raster/r.flow/io.c

+ 1 - 1
db/drivers/dbf/table.c

@@ -235,7 +235,7 @@ int save_table(int t)
 	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);

+ 1 - 1
include/defs/gis.h

@@ -657,7 +657,7 @@ char *G_strcasestr(const char *, const char *);
 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 *);

+ 2 - 2
lib/gis/tempfile.c

@@ -76,7 +76,7 @@ char *G__tempfile(int pid)
 
     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 @@ char *G__tempfile(int pid)
  *
  * \param[out] element element name
  */
-void G__temp_element(char *element)
+void G_temp_element(char *element)
 {
     const char *machine;
 

+ 1 - 1
lib/init/clean_temp.c

@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 	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 */

+ 1 - 1
lib/vector/Vlib/open.c

@@ -1447,7 +1447,7 @@ char *Vect__get_path(const struct Map_info *Map)
     
     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 {

+ 2 - 2
raster/r.flow/io.c

@@ -47,7 +47,7 @@ static const char *tmp_name(const char *fullname)
     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 @@ static int open_segment_file(const char *name, layer l, int new)
     const char *mapset;
 
     if (new == TEMP)
-	G__temp_element(string);
+	G_temp_element(string);
     else
 	sprintf(string, "cell_misc/%s", parm.elevin);