G__find_name* renamed to G_find_file* (used outside of the library)

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

db/drivers/dbf/table.c

@@ -232,7 +232,7 @@ int save_table(int t)
     /* Construct our temp name because shapelib doesn't like '.' in name */
     G__temp_element(element);
     sprintf(fname, "%d.dbf", getpid());
-    G__file_name(name, element, fname, G_mapset());
+    G_file_name(name, element, fname, G_mapset());
     G_debug(2, "Write table to tempfile: '%s'", name);
 
     dbf = DBFCreate(name);

general/g.access/main.c

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 #endif
 
     /* get the unix file name for the mapset directory */
-    G__file_name(path, "", "", G_mapset());
+    G_file_name(path, "", "", G_mapset());
 
     /* this part is until PERMANENT no longer holds DEFAULT_WIND and MYNAME */
     if (strcmp(G_mapset(), "PERMANENT") == 0)

general/g.filename/main.c

@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 	mapset = G_mapset();
 
     G__make_mapset_element(element);
-    G__file_name(path, element, name, mapset);
+    G_file_name(path, element, name, mapset);
 
     fprintf(stdout, "file='%s'\n", path);
     exit(EXIT_SUCCESS);

general/g.findfile/main.c

@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
 	const char *qchar = n_flag->answer ? "" : "'";
 	const char *qual = G_fully_qualified_name(name, mapset);
 	G_unqualified_name(name, mapset, xname, xmapset);
-	G__file_name(file, elem_opt->answer, name, mapset);
+	G_file_name(file, elem_opt->answer, name, mapset);
 	fprintf(stdout, "name=%s%s%s\n", qchar, xname, qchar);
 	fprintf(stdout, "mapset=%s%s%s\n", qchar, xmapset, qchar);
 	fprintf(stdout, "fullname=%s%s%s\n", qchar, qual, qchar);

general/g.mlist/main.c

@@ -259,7 +259,7 @@ static void make_list(
 	return;
     }
 
-    G__file_name(path, element, "", mapset);
+    G_file_name(path, element, "", mapset);
     if (access(path, 0) != 0)
 	return;
 

general/g.mremove/check_reclass.c

@@ -36,7 +36,7 @@ int check_reclass(const char *name, const char *mapset, int force)
 	if (p)
 	    *p = '\0';
 
-	G__file_name_misc(path, "cell_misc", "reclassed_to", rname, rmapset);
+	G_file_name_misc(path, "cell_misc", "reclassed_to", rname, rmapset);
 
 	if (nrmaps == 1 && !G_strcasecmp(rmaps[0], qname)) {
 

general/g.mremove/main.c

@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
 
     for (n = 0; n < nlist; n++) {
 	if (opt[n]->answers) {
-	    G__file_name(path, list[n].element[0], "", mapset);
+	    G_file_name(path, list[n].element[0], "", mapset);
 	    if (access(path, 0) != 0)
 		continue;
 	    rast = !G_strcasecmp(list[n].alias, "rast");

general/g.proj/output.c

@@ -197,12 +197,12 @@ void create_location(char *location)
 
 	    /* Write out the PROJ_INFO, and PROJ_UNITS if available. */
 	    if (projinfo != NULL) {
-		G__file_name(path, "", "PROJ_INFO", "PERMANENT");
+		G_file_name(path, "", "PROJ_INFO", "PERMANENT");
 		G_write_key_value_file(path, projinfo);
 	    }
 
 	    if (projunits != NULL) {
-		G__file_name(path, "", "PROJ_UNITS", "PERMANENT");
+		G_file_name(path, "", "PROJ_UNITS", "PERMANENT");
 		G_write_key_value_file(path, projunits);
 	    }
 

general/g.remove/main.c

@@ -55,7 +55,7 @@ static int check_reclass(const char *name, const char *mapset, int force)
 	if (p)
 	    *p = '\0';
 
-	G__file_name_misc(path, "cell_misc", "reclassed_to", rname, rmapset);
+	G_file_name_misc(path, "cell_misc", "reclassed_to", rname, rmapset);
 
 	if (nrmaps == 1 && !G_strcasecmp(rmaps[0], qname)) {
 

general/g.setproj/main.c

@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 	 * init_unit_table();
         ***/
     sprintf(set_name, "PERMANENT");
-    G__file_name(path, "", PROJECTION_FILE, set_name);
+    G_file_name(path, "", PROJECTION_FILE, set_name);
 
     /* get the output projection parameters, if existing */
     /* Check for ownership here */
@@ -502,7 +502,7 @@ int main(int argc, char *argv[])
 	G_free_key_value(old_proj_keys);
 
   write_units:
-    G__file_name(path, "", UNIT_FILE, set_name);
+    G_file_name(path, "", UNIT_FILE, set_name);
 
     /* if we got this far, the user
      ** already affirmed to write over old info

imagery/i.find/main.c

@@ -117,7 +117,7 @@ static int find(FILE * fd, char *element)
 	struct dirent *dp;
 	DIR *dfd;
 
-	G__file_name(dir, element, "", mapset);
+	G_file_name(dir, element, "", mapset);
 	if ((dfd = opendir(dir)) == NULL)
 	    continue;
 

imagery/i.ortho.photo/lib/ls_cameras.c

@@ -32,7 +32,7 @@ int I_list_cameras(int full)
 
     any = 0;
     strcpy(buf, "cd ");
-    G__file_name(buf + strlen(buf), element, "", G_mapset());
+    G_file_name(buf + strlen(buf), element, "", G_mapset());
     strcat(buf, ";ls");
     if (!full)
 	strcat(buf, " -C");

imagery/i.ortho.photo/lib/ls_elev.c

@@ -30,7 +30,7 @@ int I_list_elev(int full)
 
     any = 0;
     strcpy(buf, "cd ");
-    G__file_name(buf + strlen(buf), element, " ", " ");
+    G_file_name(buf + strlen(buf), element, " ", " ");
     strcat(buf, ";ls");
     strcat(buf, " -C");
     if (ls = popen(buf, "r")) {

include/gisdefs.h

@@ -213,9 +213,9 @@ void G_unset_error_routine(void);
 void G_init_logging(void);
 
 /* file_name.c */
-char *G__file_name(char *, const char *, const char *, const char *);
-char *G__file_name_misc(char *, const char *, const char *, const char *,
-			const char *);
+char *G_file_name(char *, const char *, const char *, const char *);
+char *G_file_name_misc(char *, const char *, const char *, const char *,
+		       const char *);
 
 /* find_cell.c */
 const char *G_find_raster(char *, const char *);

lib/g3d/filename.c

@@ -10,5 +10,5 @@ void
 G3d_filename(char *path, const char *elementName, const char *mapName,
 	     const char *mapset)
 {
-    G__file_name_misc(path, G3D_DIRECTORY, elementName, mapName, mapset);
+    G_file_name_misc(path, G3D_DIRECTORY, elementName, mapName, mapset);
 }

lib/g3d/g3dwindowio.c

@@ -63,7 +63,7 @@ static void G3d_getFullWindowPath(char *path, const char *windowName)
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
 
     if (windowName == NULL) {
-	G__file_name(path, "", G3D_WINDOW_ELEMENT, G_mapset());
+	G_file_name(path, "", G3D_WINDOW_ELEMENT, G_mapset());
 	return;
     }
 
@@ -76,11 +76,11 @@ static void G3d_getFullWindowPath(char *path, const char *windowName)
     }
 
     if (G_name_is_fully_qualified(windowName, xname, xmapset)) {
-	G__file_name(path, G3D_WINDOW_DATABASE, xname, xmapset);
+	G_file_name(path, G3D_WINDOW_DATABASE, xname, xmapset);
 	return;
     }
 
-    G__file_name(path, G3D_WINDOW_DATABASE, windowName, G_mapset());
+    G_file_name(path, G3D_WINDOW_DATABASE, windowName, G_mapset());
 }
 
 /*---------------------------------------------------------------------------*/
@@ -96,7 +96,7 @@ static void G3d_getFullWindowPath(char *path, const char *windowName)
    char *p, *slash;
 
    if (windowName == NULL) {
-   G__file_name (path, "", "", G_mapset ());
+   G_file_name (path, "", "", G_mapset ());
    return;
    }
 
@@ -104,9 +104,9 @@ static void G3d_getFullWindowPath(char *path, const char *windowName)
 
    if ((*windowName != '/') && (*windowName != '.')) {
    if (G_name_is_fully_qualified (windowName, xname, xmapset)) 
-   G__file_name (path, G3D_WINDOW_DATABASE, xname, xmapset);
+   G_file_name (path, G3D_WINDOW_DATABASE, xname, xmapset);
    else
-   G__file_name (path, G3D_WINDOW_DATABASE, windowName, G_mapset ());
+   G_file_name (path, G3D_WINDOW_DATABASE, windowName, G_mapset ());
    } else
    sprintf (path, windowName);
    p = path;

lib/gis/file_name.c

@@ -30,7 +30,7 @@
 
   \return pointer to <i>path</i>
 */
-char *G__file_name(char *path,
+char *G_file_name(char *path,
 		   const char *element, const char *name, const char *mapset)
 {
     char xname[GNAME_MAX];
@@ -67,7 +67,7 @@ char *G__file_name(char *path,
     return path;
 }
 
-char *G__file_name_misc(char *path,
+char *G_file_name_misc(char *path,
 			const char *dir,
 			const char *element,
 			const char *name, const char *mapset)

lib/gis/find_file.c

@@ -70,9 +70,9 @@ static const char *find_file(
 
 	for (n = 0; (pmapset = G__mapset_name(n)); n++) {
 	    if (misc)
-		G__file_name_misc(path, dir, element, pname, pmapset);
+		G_file_name_misc(path, dir, element, pname, pmapset);
 	    else
-		G__file_name(path, element, pname, pmapset);
+		G_file_name(path, element, pname, pmapset);
 	    if (access(path, 0) == 0) {
 		if (!pselmapset)
 		    pselmapset = pmapset;
@@ -99,9 +99,9 @@ static const char *find_file(
      */
     else {
 	if (misc)
-	    G__file_name_misc(path, dir, element, pname, pmapset);
+	    G_file_name_misc(path, dir, element, pname, pmapset);
 	else
-	    G__file_name(path, element, pname, pmapset);
+	    G_file_name(path, element, pname, pmapset);
 	    
 	if (access(path, 0) == 0)
 	    return G_store(pmapset);

lib/gis/get_ellipse.c

@@ -72,7 +72,7 @@ int G_get_ellipsoid_parameters(double *a, double *e2)
 
     proj_keys = NULL;
 
-    G__file_name(ipath, "", PROJECTION_FILE, PERMANENT);
+    G_file_name(ipath, "", PROJECTION_FILE, PERMANENT);
 
     if (access(ipath, 0) != 0) {
 	*a = 6378137.0;

lib/gis/get_projinfo.c

@@ -27,7 +27,7 @@ struct Key_Value *G_get_projunits(void)
     struct Key_Value *in_units_keys;
     char path[GPATH_MAX];
 
-    G__file_name(path, "", UNIT_FILE, PERMANENT);
+    G_file_name(path, "", UNIT_FILE, PERMANENT);
     if (access(path, 0) != 0) {
 	if (G_projection() != PROJECTION_XY) {
 	    G_warning(_("<%s> file not found for location <%s>"),
@@ -50,7 +50,7 @@ struct Key_Value *G_get_projinfo(void)
     struct Key_Value *in_proj_keys;
     char path[GPATH_MAX];
 
-    G__file_name(path, "", PROJECTION_FILE, PERMANENT);
+    G_file_name(path, "", PROJECTION_FILE, PERMANENT);
     if (access(path, 0) != 0) {
 	if (G_projection() != PROJECTION_XY) {
 	    G_warning(_("<%s> file not found for location <%s>"),

lib/gis/list.c

@@ -115,7 +115,7 @@ static int list_element(FILE *out, const char *element, const char *desc, const
      *
      * if lister() routine is given, the ls command must give 1 name
      */
-    G__file_name(path, element, "", mapset);
+    G_file_name(path, element, "", mapset);
     if (access(path, 0) != 0) {
 	fprintf(out, "\n");
 	return count;

lib/gis/make_loc.c

@@ -68,12 +68,12 @@ int G__make_location(const char *location_name,
 
     /* Write out the PROJ_INFO, and PROJ_UNITS if available. */
     if (proj_info != NULL) {
-	G__file_name(path, "", "PROJ_INFO", "PERMANENT");
+	G_file_name(path, "", "PROJ_INFO", "PERMANENT");
 	G_write_key_value_file(path, proj_info);
     }
 
     if (proj_units != NULL) {
-	G__file_name(path, "", "PROJ_UNITS", "PERMANENT");
+	G_file_name(path, "", "PROJ_UNITS", "PERMANENT");
 	G_write_key_value_file(path, proj_units);
     }
 

lib/gis/mapset_msc.c

@@ -42,7 +42,7 @@ int G__make_mapset_element(const char *p_element)
     if (*element == 0)
 	return 0;
 
-    G__file_name(p = path, "", "", G_mapset());
+    G_file_name(p = path, "", "", G_mapset());
     while (*p)
 	p++;
     /* add trailing slash if missing */
@@ -102,7 +102,7 @@ int G__mapset_permissions(const char *mapset)
     char path[GPATH_MAX];
     STRUCT_STAT info;
 
-    G__file_name(path, "", "", mapset);
+    G_file_name(path, "", "", mapset);
 
     if (G_stat(path, &info) != 0)
 	return -1;

lib/gis/myname.c

@@ -37,7 +37,7 @@ char *G_myname(void)
 
     ok = 0;
 
-    G__file_name(path, "", "MYNAME", "PERMANENT");
+    G_file_name(path, "", "MYNAME", "PERMANENT");
     if ((fd = fopen(path, "r"))) {
 	ok = G_getl(name, sizeof name, fd);
 	fclose(fd);

lib/gis/open.c

@@ -72,7 +72,7 @@ static int G__open(const char *element,
 	if (!mapset)
 	    return -1;
 
-	G__file_name(path, element, name, mapset);
+	G_file_name(path, element, name, mapset);
 
 	return open(path, 0);
     }
@@ -91,7 +91,7 @@ static int G__open(const char *element,
 	if (G_legal_filename(name) == -1)
 	    return -1;
 
-	G__file_name(path, element, name, mapset);
+	G_file_name(path, element, name, mapset);
 
 	if (mode == 1 || access(path, 0) != 0) {
 	    G__make_mapset_element(element);

lib/gis/open_misc.c

@@ -55,7 +55,7 @@ static int G__open_misc(const char *dir,
 	if (!mapset)
 	    return -1;
 
-	G__file_name_misc(path, dir, element, name, mapset);
+	G_file_name_misc(path, dir, element, name, mapset);
 
 	return open(path, 0);
     }
@@ -74,7 +74,7 @@ static int G__open_misc(const char *dir,
 	if (G_legal_filename(name) == -1)
 	    return -1;
 
-	G__file_name_misc(path, dir, element, name, mapset);
+	G_file_name_misc(path, dir, element, name, mapset);
 	if (mode == 1 || access(path, 0) != 0) {
 	    G__make_mapset_element_misc(dir, name);
 	    close(creat(path, 0666));

lib/gis/remove.c

@@ -87,9 +87,9 @@ static int G__remove(int misc, const char *dir, const char *element,
 	return -1;
 
     if (misc)
-	G__file_name_misc(path, dir, element, name, mapset);
+	G_file_name_misc(path, dir, element, name, mapset);
     else
-	G__file_name(path, element, name, mapset);
+	G_file_name(path, element, name, mapset);
 
     /* if file does not exist, return 0 */
     if (access(path, 0) != 0)

lib/gis/rename.c

@@ -72,10 +72,10 @@ int G_rename(const char *element, const char *oldname, const char *newname)
 	return -1;
 
     /* if file does not exist return 0 */
-    if (access(G__file_name(from, element, oldname, mapset), 0) != 0)
+    if (access(G_file_name(from, element, oldname, mapset), 0) != 0)
 	return 0;
 
-    G__file_name(to, element, newname, mapset);
+    G_file_name(to, element, newname, mapset);
 
     /* return result of rename */
     return G_rename_file(from, to) == 0 ? 1 : -1;

lib/gis/tempfile.c

@@ -81,7 +81,7 @@ char *G__tempfile(int pid)
     do {
 	int uniq = G_counter_next(&unique);
 	sprintf(name, "%d.%d", pid, uniq);
-	G__file_name(path, element, name, G_mapset());
+	G_file_name(path, element, name, G_mapset());
     }
     while (access(path, F_OK) == 0);
 

lib/init/clean_temp.c

@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
 
     /* Get the mapset temp directory */
     G__temp_element(element);
-    G__file_name(tmppath, element, "", mapset = G_mapset());
+    G_file_name(tmppath, element, "", mapset = G_mapset());
 
     /* get user id and current time in seconds */
 #ifdef __MINGW32__

lib/manage/do_copy.c

@@ -34,7 +34,7 @@ int 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__file_name(path, list[n].element[i], old, mapset);
+	    G_file_name(path, list[n].element[i], old, mapset);
 	    if (access(path, 0) != 0) {
 		G_remove(list[n].element[i], new);
 		if (G_verbose() == G_verbose_max())
@@ -42,7 +42,7 @@ int do_copy(int n, const char *old, const char *mapset, const char *new)
 
 		continue;
 	    }
-	    G__file_name(path2, list[n].element[i], new, G_mapset());
+	    G_file_name(path2, list[n].element[i], new, G_mapset());
 	    if (G_recursive_copy(path, path2) == 1) {
 		result = 1;
 	    }

lib/manage/empty.c

@@ -10,7 +10,7 @@ int empty(char *elem)
     char dir[1024];
     int any;
 
-    G__file_name(dir, elem, "", G_mapset());
+    G_file_name(dir, elem, "", G_mapset());
 
     any = 0;
     if ((dirp = opendir(dir)) != NULL) {

lib/raster/close.c

@@ -227,7 +227,7 @@ static void write_support_files(int fd)
     }
     else {
 	/* remove cell_misc/name/f_quant */
-	G__file_name_misc(path, "cell_misc", QUANT_FILE, fcb->name,
+	G_file_name_misc(path, "cell_misc", QUANT_FILE, fcb->name,
 			  fcb->mapset);
 	remove(path);
     }
@@ -275,13 +275,13 @@ static int close_new_gdal(int fd, int ok)
 
 	/* create path : full null file name */
 	G__make_mapset_element_misc("cell_misc", fcb->name);
-	G__file_name_misc(path, "cell_misc", NULL_FILE, fcb->name,
+	G_file_name_misc(path, "cell_misc", NULL_FILE, fcb->name,
 			  G_mapset());
 	remove(path);
 
 	/* write 0-length cell file */
 	G__make_mapset_element("cell");
-	G__file_name(path, "cell", fcb->name, fcb->mapset);
+	G_file_name(path, "cell", fcb->name, fcb->mapset);
 	cell_fd = creat(path, 0666);
 	close(cell_fd);
 
@@ -290,16 +290,16 @@ static int close_new_gdal(int fd, int ok)
 
 	    /* write 0-length fcell file */
 	    G__make_mapset_element("fcell");
-	    G__file_name(path, "fcell", fcb->name, fcb->mapset);
+	    G_file_name(path, "fcell", fcb->name, fcb->mapset);
 	    cell_fd = creat(path, 0666);
 	    close(cell_fd);
 	}
 	else {
 	    /* remove fcell/name file */
-	    G__file_name(path, "fcell", fcb->name, fcb->mapset);
+	    G_file_name(path, "fcell", fcb->name, fcb->mapset);
 	    remove(path);
 	    /* remove cell_misc/name/f_format */
-	    G__file_name_misc(path, "cell_misc", FORMAT_FILE, fcb->name,
+	    G_file_name_misc(path, "cell_misc", FORMAT_FILE, fcb->name,
 			      fcb->mapset);
 	    remove(path);
 	}
@@ -366,7 +366,7 @@ static int close_new(int fd, int ok)
 
 	/* create path : full null file name */
 	G__make_mapset_element_misc("cell_misc", fcb->name);
-	G__file_name_misc(path, "cell_misc", NULL_FILE, fcb->name,
+	G_file_name_misc(path, "cell_misc", NULL_FILE, fcb->name,
 			  G_mapset());
 	remove(path);
 
@@ -399,17 +399,17 @@ static int close_new(int fd, int ok)
 	    /* now write 0-length cell file */
 	    G__make_mapset_element("cell");
 	    cell_fd =
-		creat(G__file_name(path, "cell", fcb->name, fcb->mapset),
+		creat(G_file_name(path, "cell", fcb->name, fcb->mapset),
 		      0666);
 	    close(cell_fd);
 	    CELL_DIR = "fcell";
 	}
 	else {
 	    /* remove fcell/name file */
-	    G__file_name(path, "fcell", fcb->name, fcb->mapset);
+	    G_file_name(path, "fcell", fcb->name, fcb->mapset);
 	    remove(path);
 	    /* remove cell_misc/name/f_format */
-	    G__file_name_misc(path, "cell_misc", FORMAT_FILE, fcb->name,
+	    G_file_name_misc(path, "cell_misc", FORMAT_FILE, fcb->name,
 			      fcb->mapset);
 	    remove(path);
 	    CELL_DIR = "cell";
@@ -436,7 +436,7 @@ static int close_new(int fd, int ok)
      */
     stat = 1;
     if (ok && (fcb->temp_name != NULL)) {
-	G__file_name(path, CELL_DIR, fcb->name, fcb->mapset);
+	G_file_name(path, CELL_DIR, fcb->name, fcb->mapset);
 	remove(path);
 	if (rename(fcb->temp_name, path)) {
 	    G_warning(_("Unable to rename cell file '%s'"),
@@ -489,7 +489,7 @@ static void write_fp_format(int fd)
 	G_set_key_value("lzw_compression_bits", "-1", format_kv);
 
     G__make_mapset_element_misc("cell_misc", fcb->name);
-    G__file_name_misc(path, "cell_misc", FORMAT_FILE, fcb->name, fcb->mapset);
+    G_file_name_misc(path, "cell_misc", FORMAT_FILE, fcb->name, fcb->mapset);
     G_write_key_value_file(path, format_kv);
 
     G_free_key_value(format_kv);

lib/raster/gdal.c

@@ -372,7 +372,7 @@ static void read_gdal_options(void)
     else {
 	char path[GPATH_MAX];
 
-	G__file_name(path, p, "", G_mapset());
+	G_file_name(path, p, "", G_mapset());
 	st->opts.dir = G_store(path);
 	if (access(path, 0) != 0)
 	    G__make_mapset_element(p);

lib/raster/open.c

@@ -742,11 +742,11 @@ int Rast_map_is_fp(const char *name, const char *mapset)
 	G_fatal_error(_("Raster map <%s> not found"),
 		      G_fully_qualified_name(name, mapset));
 
-    G__file_name(path, "fcell", name, xmapset);
+    G_file_name(path, "fcell", name, xmapset);
     if (access(path, 0) == 0)
 	return 1;
 
-    G__file_name(path, "g3dcell", name, xmapset);
+    G_file_name(path, "g3dcell", name, xmapset);
     if (access(path, 0) == 0)
 	return 1;
 
@@ -779,12 +779,12 @@ RASTER_MAP_TYPE Rast_map_type(const char *name, const char *mapset)
 	    G_fatal_error(_("Raster map <%s> not found"), name);
     }
 
-    G__file_name(path, "fcell", name, xmapset);
+    G_file_name(path, "fcell", name, xmapset);
 
     if (access(path, 0) == 0)
 	return Rast__check_fp_type(name, xmapset);
 
-    G__file_name(path, "g3dcell", name, xmapset);
+    G_file_name(path, "g3dcell", name, xmapset);
 
     if (access(path, 0) == 0)
 	return DCELL_TYPE;
@@ -831,7 +831,7 @@ RASTER_MAP_TYPE Rast__check_fp_type(const char *name, const char *mapset)
 	G_fatal_error(_("Raster map <%s> not found"),
 		      G_fully_qualified_name(name, mapset));
 
-    G__file_name_misc(path, "cell_misc", FORMAT_FILE, name, xmapset);
+    G_file_name_misc(path, "cell_misc", FORMAT_FILE, name, xmapset);
 
     if (access(path, 0) != 0)
 	G_fatal_error(_("Unable to find '%s'"), path);

lib/raster/reclass.c

@@ -320,7 +320,7 @@ int Rast_put_reclass(const char *name, const struct Reclass *reclass)
     if ((p = strchr(buf2, '@')))
 	*p = 0;
 
-    G__file_name_misc(buf1, "cell_misc", "reclassed_to", reclass->name,
+    G_file_name_misc(buf1, "cell_misc", "reclassed_to", reclass->name,
 		      reclass->mapset);
 
     fd = fopen(buf1, "a+");

lib/vector/Vlib/build.c

@@ -251,7 +251,7 @@ int Vect_save_topo(struct Map_info *Map)
 
     /*  write out all the accumulated info to the plus file  */
     sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
-    G__file_name(fname, buf, GV_TOPO_ELEMENT, Map->mapset);
+    G_file_name(fname, buf, GV_TOPO_ELEMENT, Map->mapset);
     G_debug(1, "Open topo: %s", fname);
     dig_file_init(&fp);
     fp.file = fopen(fname, "w");
@@ -533,7 +533,7 @@ int Vect_save_sidx(struct Map_info *Map)
 
 	/*  write out rtrees to sidx file  */
 	sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
-	G__file_name(fname, buf, GV_SIDX_ELEMENT, Map->mapset);
+	G_file_name(fname, buf, GV_SIDX_ELEMENT, Map->mapset);
 	G_debug(1, "Open sidx: %s", fname);
 	dig_file_init(&(plus->spidx_fp));
 	plus->spidx_fp.file = fopen(fname, "w+");

lib/vector/Vlib/cindex.c

@@ -452,7 +452,7 @@ int Vect_cidx_save(struct Map_info *Map)
     plus = &(Map->plus);
 
     sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
-    G__file_name(fname, buf, GV_CIDX_ELEMENT, Map->mapset);
+    G_file_name(fname, buf, GV_CIDX_ELEMENT, Map->mapset);
     G_debug(2, "Open cidx: %s", fname);
     dig_file_init(&fp);
     fp.file = fopen(fname, "w");
@@ -497,7 +497,7 @@ int Vect_cidx_open(struct Map_info *Map, int head_only)
     Plus = &(Map->plus);
 
     sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
-    G__file_name(file_path, buf, GV_CIDX_ELEMENT, Map->mapset);
+    G_file_name(file_path, buf, GV_CIDX_ELEMENT, Map->mapset);
 
     if (access(file_path, F_OK) != 0)	/* does not exist */
 	return 1;

lib/vector/Vlib/close.c

@@ -79,15 +79,15 @@ int Vect_close(struct Map_info *Map)
 	/* Delete old support files if available */
 	sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
 
-	G__file_name(file_path, buf, GV_TOPO_ELEMENT, G_mapset());
+	G_file_name(file_path, buf, GV_TOPO_ELEMENT, G_mapset());
 	if (access(file_path, F_OK) == 0)	/* file exists? */
 	    unlink(file_path);
 
-	G__file_name(file_path, buf, GV_SIDX_ELEMENT, G_mapset());
+	G_file_name(file_path, buf, GV_SIDX_ELEMENT, G_mapset());
 	if (access(file_path, F_OK) == 0)	/* file exists? */
 	    unlink(file_path);
 
-	G__file_name(file_path, buf, GV_CIDX_ELEMENT, G_mapset());
+	G_file_name(file_path, buf, GV_CIDX_ELEMENT, G_mapset());
 	if (access(file_path, F_OK) == 0)	/* file exists? */
 	    unlink(file_path);
 

lib/vector/Vlib/close_ogr.c

@@ -86,7 +86,7 @@ int V2_close_ogr(struct Map_info *Map)
     if (strcmp(Map->mapset, G_mapset()) == 0 && Map->support_updated &&
 	Map->plus.built == GV_BUILD_ALL) {
 	sprintf(elem, "%s/%s", GV_DIRECTORY, Map->name);
-	G__file_name(fname, elem, "fidx", Map->mapset);
+	G_file_name(fname, elem, "fidx", Map->mapset);
 	G_debug(4, "Open fidx: %s", fname);
 	dig_file_init(&fp);
 	fp.file = fopen(fname, "w");

lib/vector/Vlib/header.c

@@ -692,6 +692,6 @@ static int lookup(const char *file, const char *key, char *value, size_t len)
 {
     char path[GPATH_MAX];
 
-    G__file_name(path, "", file, "PERMANENT");
+    G_file_name(path, "", file, "PERMANENT");
     return G_lookup_key_value_from_file(path, key, value, (int) len) == 1;
 }

lib/vector/Vlib/map.c

@@ -247,7 +247,7 @@ int Vect_copy(const char *in, const char *mapset, const char *out)
     }
     mapset = inmapset;
 
-    /* remove mapset from fully qualified name, confuses G__file_name() */
+    /* remove mapset from fully qualified name, confuses G_file_name() */
     if (G_name_is_fully_qualified(in, xname, xmapset)) {
 	in = xname;
     }
@@ -271,9 +271,9 @@ int Vect_copy(const char *in, const char *mapset, const char *out)
     i = 0;
     while (files[i]) {
 	sprintf(buf, "%s/%s", in, files[i]);
-	G__file_name(old_path, GV_DIRECTORY, buf, mapset);
+	G_file_name(old_path, GV_DIRECTORY, buf, mapset);
 	sprintf(buf, "%s/%s", out, files[i]);
-	G__file_name(new_path, GV_DIRECTORY, buf, G_mapset());
+	G_file_name(new_path, GV_DIRECTORY, buf, G_mapset());
 
 	if (access(old_path, F_OK) == 0) {	/* file exists? */
 	    G_debug(2, "copy %s to %s", old_path, new_path);
@@ -285,8 +285,8 @@ int Vect_copy(const char *in, const char *mapset, const char *out)
 	i++;
     }
 
-    G__file_name(old_path, GV_DIRECTORY, in, mapset);
-    G__file_name(new_path, GV_DIRECTORY, out, G_mapset());
+    G_file_name(old_path, GV_DIRECTORY, in, mapset);
+    G_file_name(new_path, GV_DIRECTORY, out, G_mapset());
 
     /* Open input */
     Vect_set_open_level(1);

lib/vector/Vlib/open.c

@@ -480,15 +480,15 @@ int Vect__open_old(struct Map_info *Map, const char *name, const char *mapset, c
 
 	sprintf(buf, "%s/%s", GV_DIRECTORY, name);
 
-	G__file_name(file_path, buf, GV_TOPO_ELEMENT, G_mapset());
+	G_file_name(file_path, buf, GV_TOPO_ELEMENT, G_mapset());
 	if (access(file_path, F_OK) == 0)	/* file exists? */
 	    unlink(file_path);
 
-	G__file_name(file_path, buf, GV_SIDX_ELEMENT, G_mapset());
+	G_file_name(file_path, buf, GV_SIDX_ELEMENT, G_mapset());
 	if (access(file_path, F_OK) == 0)	/* file exists? */
 	    unlink(file_path);
 
-	G__file_name(file_path, buf, GV_CIDX_ELEMENT, G_mapset());
+	G_file_name(file_path, buf, GV_CIDX_ELEMENT, G_mapset());
 	if (access(file_path, F_OK) == 0)	/* file exists? */
 	    unlink(file_path);
     }
@@ -833,7 +833,7 @@ int Vect_coor_info(const struct Map_info *Map, struct Coor_info *Info)
     switch (Map->format) {
     case GV_FORMAT_NATIVE:
 	sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
-	G__file_name(path, buf, GV_COOR_ELEMENT, Map->mapset);
+	G_file_name(path, buf, GV_COOR_ELEMENT, Map->mapset);
 	G_debug(1, "get coor info: %s", path);
 	if (0 != stat(path, &stat_buf)) {
 	    G_warning(_("Unable to stat file <%s>"), path);
@@ -943,7 +943,7 @@ int Vect_open_topo(struct Map_info *Map, int head_only)
     Plus = &(Map->plus);
 
     sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
-    G__file_name(file_path, buf, GV_TOPO_ELEMENT, Map->mapset);
+    G_file_name(file_path, buf, GV_TOPO_ELEMENT, Map->mapset);
 
     if (access(file_path, F_OK) != 0)	/* does not exist */
 	return 1;
@@ -1032,7 +1032,7 @@ int Vect_open_sidx(struct Map_info *Map, int mode)
 
     if (mode < 2) {
 	sprintf(buf, "%s/%s", GV_DIRECTORY, Map->name);
-	G__file_name(file_path, buf, GV_SIDX_ELEMENT, Map->mapset);
+	G_file_name(file_path, buf, GV_SIDX_ELEMENT, Map->mapset);
 
 	if (access(file_path, F_OK) != 0)	/* does not exist */
 	    return 1;

lib/vector/Vlib/open_nat.c

@@ -119,11 +119,11 @@ int V1_open_new_nat(struct Map_info *Map, const char *name, int with_z)
     /* if overwrite OK, any existing files have already been deleted by
      * Vect_open_new(): remove this check ? */
     /* check to see if dig_plus file exists and if so, remove it */
-    G__file_name(name_buf, buf, GV_TOPO_ELEMENT, G_mapset());
+    G_file_name(name_buf, buf, GV_TOPO_ELEMENT, G_mapset());
     if (access(name_buf, F_OK) == 0)	/* file exists? */
 	unlink(name_buf);
 
-    G__file_name(name_buf, buf, GV_COOR_ELEMENT, G_mapset());
+    G_file_name(name_buf, buf, GV_COOR_ELEMENT, G_mapset());
 
     Map->head.size = 0;
     Map->head.head_size = GV_COOR_HEAD_SIZE + 4;

raster/r.null/main.c

@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
 	G_verbose_message(_("Removing null file for raster map <%s>..."),
 			   name);
 	null_fd = G_open_new_misc("cell_misc", "null", name);
-	G__file_name_misc(path, "cell_misc", "null", name, mapset);
+	G_file_name_misc(path, "cell_misc", "null", name, mapset);
 	unlink(path);
 
 	G_done_msg(_("Raster map <%s> modified."), name);

raster/r.support/main.c

@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
 	G_message(_("Removing null file for [%s]...\n"), raster->answer);
 
 	null_fd = G_open_new_misc("cell_misc", "null", raster->answer);
-	G__file_name_misc(path, "cell_misc", "null", raster->answer, G_mapset());
+	G_file_name_misc(path, "cell_misc", "null", raster->answer, G_mapset());
 	unlink(path);
 	close(null_fd);
 

vector/v.proj/main.c

@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
      /*DEBUG*/ {
 	char path[256];
 
-	G__file_name(path, "", "", iset_name);
+	G_file_name(path, "", "", iset_name);
     }
 
     if (stat >= 0) {		/* yes, we can access the mapset */