[GRASS-SVN] r38594 - in grass/trunk: display/d.title include lib/g3d lib/gis lib/raster

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-08-03 08:32:41 -0400 (Mon, 03 Aug 2009)
New Revision: 38594

Modified:
   grass/trunk/display/d.title/fancy.c
   grass/trunk/display/d.title/normal.c
   grass/trunk/include/gisdefs.h
   grass/trunk/lib/g3d/g3dopen.c
   grass/trunk/lib/gis/nme_in_mps.c
   grass/trunk/lib/raster/opencell.c
Log:
gislib: G__unqualified_name() renamed to G_unqualified_name()


Modified: grass/trunk/display/d.title/fancy.c
===================================================================
--- grass/trunk/display/d.title/fancy.c	2009-08-03 06:57:46 UTC (rev 38593)
+++ grass/trunk/display/d.title/fancy.c	2009-08-03 12:32:41 UTC (rev 38594)
@@ -6,7 +6,7 @@
 {
     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);

Modified: grass/trunk/display/d.title/normal.c
===================================================================
--- grass/trunk/display/d.title/normal.c	2009-08-03 06:57:46 UTC (rev 38593)
+++ grass/trunk/display/d.title/normal.c	2009-08-03 12:32:41 UTC (rev 38594)
@@ -7,7 +7,7 @@
 {
     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);

Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h	2009-08-03 06:57:46 UTC (rev 38593)
+++ grass/trunk/include/gisdefs.h	2009-08-03 12:32:41 UTC (rev 38594)
@@ -413,7 +413,7 @@
 /* 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 *);

Modified: grass/trunk/lib/g3d/g3dopen.c
===================================================================
--- grass/trunk/lib/g3d/g3dopen.c	2009-08-03 06:57:46 UTC (rev 38593)
+++ grass/trunk/lib/g3d/g3dopen.c	2009-08-03 12:32:41 UTC (rev 38594)
@@ -27,7 +27,7 @@
 	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 @@
 	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;
     }

Modified: grass/trunk/lib/gis/nme_in_mps.c
===================================================================
--- grass/trunk/lib/gis/nme_in_mps.c	2009-08-03 06:57:46 UTC (rev 38593)
+++ grass/trunk/lib/gis/nme_in_mps.c	2009-08-03 12:32:41 UTC (rev 38594)
@@ -125,7 +125,7 @@
   \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)) {

Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c	2009-08-03 06:57:46 UTC (rev 38593)
+++ grass/trunk/lib/raster/opencell.c	2009-08-03 12:32:41 UTC (rev 38594)
@@ -171,7 +171,7 @@
 
     Rast__init();
 
-    G__unqualified_name(name, mapset, xname, xmapset);
+    G_unqualified_name(name, mapset, xname, xmapset);
     name = xname;
     mapset = xmapset;
 
@@ -584,7 +584,7 @@
 	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);