libgis: G__make_mapset_element() -> G_make_mapset_element()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63846 15284696-431f-4ddb-bdfa-cd5b030d7da7

include/defs/gis.h

@@ -444,7 +444,7 @@ const char *G_mapset(void);
 char *G_mapset_path(void);
 
 /* mapset_msc.c */
-int G__make_mapset_element(const char *);
+int G_make_mapset_element(const char *);
 int G__make_mapset_element_misc(const char *, const char *);
 int G_mapset_permissions(const char *);
 int G_mapset_permissions2(const char *, const char *, const char *);

lib/db/dbmi_base/default_name.c

@@ -108,7 +108,7 @@ int db_set_default_connection(void)
 	db_set_connection(&connection);
 
 	sprintf(buf, "%s/%s/dbf", G_location_path(), G_mapset());
-	G__make_mapset_element("dbf");
+	G_make_mapset_element("dbf");
     }
     else if (strcmp(DB_DEFAULT_DRIVER, "sqlite") == 0) {
 	/* Set default values and create sqlite db dir */
@@ -129,7 +129,7 @@ int db_set_default_connection(void)
 	  */
 	connection.databaseName =
 	    "$GISDBASE/$LOCATION_NAME/$MAPSET/sqlite/sqlite.db";
-	G__make_mapset_element("sqlite");
+	G_make_mapset_element("sqlite");
 	db_set_connection(&connection);
     }
     else

lib/gis/mapset_msc.c

@@ -32,7 +32,7 @@
    \return 0 ?
    \return ?
  */
-int G__make_mapset_element(const char *p_element)
+int G_make_mapset_element(const char *p_element)
 {
     char path[GPATH_MAX];
     char *p;
@@ -85,7 +85,7 @@ int G__make_mapset_element_misc(const char *dir, const char *name)
     char buf[GNAME_MAX * 2 + 1];
 
     sprintf(buf, "%s/%s", dir, name);
-    return G__make_mapset_element(buf);
+    return G_make_mapset_element(buf);
 }
 
 static int check_owner(const struct stat *info)

lib/gis/open.c

@@ -99,7 +99,7 @@ static int G__open(const char *element,
 	G_file_name(path, element, name, mapset);
 
 	if (mode == 1 || access(path, 0) != 0) {
-	    G__make_mapset_element(element);
+	    G_make_mapset_element(element);
 	    close(open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666));
 	}
 

lib/gis/tempfile.c

@@ -103,5 +103,5 @@ void G_temp_element(char *element)
 	strcat(element, "/");
 	strcat(element, machine);
     }
-    G__make_mapset_element(element);
+    G_make_mapset_element(element);
 }

lib/manage/do_copy.c

@@ -54,7 +54,7 @@ int M_do_copy(int n, const char *old, const char *mapset, const char *new)
     }
     else {
 	for (i = 0; i < list[n].nelem; i++) {
-	    G__make_mapset_element(list[n].element[i]);
+	    G_make_mapset_element(list[n].element[i]);
 	    G_file_name(path, list[n].element[i], old, mapset);
 	    if (access(path, 0) != 0) {
 		G_remove(list[n].element[i], new);

lib/raster/close.c

@@ -280,7 +280,7 @@ static int close_new_gdal(int fd, int ok)
 	remove(path);
 
 	/* write 0-length cell file */
-	G__make_mapset_element("cell");
+	G_make_mapset_element("cell");
 	G_file_name(path, "cell", fcb->name, fcb->mapset);
 	cell_fd = creat(path, 0666);
 	close(cell_fd);
@@ -289,7 +289,7 @@ static int close_new_gdal(int fd, int ok)
 	    write_fp_format(fd);
 
 	    /* write 0-length fcell file */
-	    G__make_mapset_element("fcell");
+	    G_make_mapset_element("fcell");
 	    G_file_name(path, "fcell", fcb->name, fcb->mapset);
 	    cell_fd = creat(path, 0666);
 	    close(cell_fd);
@@ -396,7 +396,7 @@ static int close_new(int fd, int ok)
 	    write_fp_format(fd);
 
 	    /* now write 0-length cell file */
-	    G__make_mapset_element("cell");
+	    G_make_mapset_element("cell");
 	    cell_fd =
 		creat(G_file_name(path, "cell", fcb->name, fcb->mapset),
 		      0666);

lib/raster/gdal.c

@@ -384,7 +384,7 @@ static void read_gdal_options(void)
 	G_file_name(path, p, "", G_mapset());
 	st->opts.dir = G_store(path);
 	if (access(path, 0) != 0)
-	    G__make_mapset_element(p);
+	    G_make_mapset_element(p);
     }
 
     p = G_find_key_value("extension", key_val);

lib/raster/open.c

@@ -603,7 +603,7 @@ static int open_raster_new(const char *name, int open_mode,
      * since we are bypassing the normal open logic
      * must create the cell element 
      */
-    G__make_mapset_element(cell_dir);
+    G_make_mapset_element(cell_dir);
 
     /* mark closed */
     fcb->map_type = map_type;

lib/raster/quant_io.c

@@ -287,7 +287,7 @@ int Rast__quant_export(const char *name, const char *mapset,
     else {
 	sprintf(element, "quant2/%s", mapset);
 	G_remove(element, name);
-	G__make_mapset_element(element);
+	G_make_mapset_element(element);
 	if (!(fd = G_fopen_new(element, name)))
 	    return -1;
     }

lib/raster3d/mapset.c

@@ -11,5 +11,5 @@ void Rast3d_make_mapset_map_directory(const char *mapName)
     char buf[GNAME_MAX + sizeof(RASTER3D_DIRECTORY) + 2];
 
     sprintf(buf, "%s/%s", RASTER3D_DIRECTORY, mapName);
-    G__make_mapset_element(buf);
+    G_make_mapset_element(buf);
 }

lib/vector/Vlib/map.c

@@ -129,9 +129,9 @@ int Vect_copy(const char *in, const char *mapset, const char *out)
     }
 
     /* Copy the directory */
-    G__make_mapset_element(GV_DIRECTORY);
+    G_make_mapset_element(GV_DIRECTORY);
     sprintf(buf, "%s/%s", GV_DIRECTORY, out);
-    G__make_mapset_element(buf);
+    G_make_mapset_element(buf);
 
     i = 0;
     while (files[i]) {