瀏覽代碼

gislib: G__unqualified_name() renamed to G_unqualified_name()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38594 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 年之前
父節點
當前提交
c797fb8d93
共有 6 個文件被更改,包括 8 次插入8 次删除
  1. 1 1
      display/d.title/fancy.c
  2. 1 1
      display/d.title/normal.c
  3. 1 1
      include/gisdefs.h
  4. 2 2
      lib/g3d/g3dopen.c
  5. 1 1
      lib/gis/nme_in_mps.c
  6. 2 2
      lib/raster/opencell.c

+ 1 - 1
display/d.title/fancy.c

@@ -6,7 +6,7 @@ void fancy(struct Cell_head *window, struct Categories *cats, FILE * fp)
 {
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
 
-    G__unqualified_name(map_name, G_mapset(), xname, xmapset);
+    G_unqualified_name(map_name, G_mapset(), xname, xmapset);
 
     fprintf(fp, ".C %s\n", "green");
     fprintf(fp, ".S %f\n", size + 1.0);

+ 1 - 1
display/d.title/normal.c

@@ -7,7 +7,7 @@ void normal(struct Cell_head *window, struct Categories *cats,
 {
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
 
-    G__unqualified_name(map_name, G_mapset(), xname, xmapset);
+    G_unqualified_name(map_name, G_mapset(), xname, xmapset);
 
     fprintf(fp, ".C %s\n", color);
     fprintf(fp, ".S %f\n", size);

+ 1 - 1
include/gisdefs.h

@@ -413,7 +413,7 @@ void G_newlines_to_spaces(char *);
 /* nme_in_mps.c */
 int G__name_is_fully_qualified(const char *, char *, char *);
 char *G_fully_qualified_name(const char *, const char *);
-int G__unqualified_name(const char *, const char *, char *, char *);
+int G_unqualified_name(const char *, const char *, char *, char *);
 
 /* open.c */
 int G_open_new(const char *, const char *);

+ 2 - 2
lib/g3d/g3dopen.c

@@ -27,7 +27,7 @@ void *G3d_openCellOldNoHeader(const char *name, const char *mapset)
 	return (void *)NULL;
     }
 
-    G__unqualified_name(name, mapset, xname, xmapset);
+    G_unqualified_name(name, mapset, xname, xmapset);
 
     map->fileName = G_store(xname);
     map->mapset = G_store(xmapset);
@@ -225,7 +225,7 @@ void *G3d_openCellNew(const char *name, int typeIntern, int cache,
 	return (void *)NULL;
     }
 
-    if (G__unqualified_name(name, G_mapset(), xname, xmapset) < 0) {
+    if (G_unqualified_name(name, G_mapset(), xname, xmapset) < 0) {
 	G_warning(_("map <%s> is not in the current mapset"), name);
 	return (void *)NULL;
     }

+ 1 - 1
lib/gis/nme_in_mps.c

@@ -125,7 +125,7 @@ char *G_fully_qualified_name(const char *name, const char *mapset)
   \return  0 if ...
   \return -1 if input mapset invalid
  */
-int G__unqualified_name(const char *name, const char *mapset,
+int G_unqualified_name(const char *name, const char *mapset,
 			char *xname, char *xmapset)
 {
     if (G__name_is_fully_qualified(name, xname, xmapset)) {

+ 2 - 2
lib/raster/opencell.c

@@ -171,7 +171,7 @@ int Rast__open_old(const char *name, const char *mapset)
 
     Rast__init();
 
-    G__unqualified_name(name, mapset, xname, xmapset);
+    G_unqualified_name(name, mapset, xname, xmapset);
     name = xname;
     mapset = xmapset;
 
@@ -584,7 +584,7 @@ static int G__open_raster_new(const char *name, int open_mode,
 	break;
     }
 
-    if (G__unqualified_name(name, G_mapset(), xname, xmapset) < 0)
+    if (G_unqualified_name(name, G_mapset(), xname, xmapset) < 0)
 	G_fatal_error(_("Raster map <%s> is not in the current mapset (%s)"),
 		      name, G_mapset());
     map = G_store(xname);