[GRASS-SVN] r38596 - in grass/trunk: gui/wxpython/vdigit
imagery/i.class imagery/i.group imagery/i.points
imagery/i.target imagery/i.vpoints include lib/g3d lib/gis
lib/imagery lib/manage lib/raster lib/vector/Vlib
raster3d/r3.mkdspf raster3d/r3.showdspf
vector/lidar/v.lidar.growing vector/v.out.ogr
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Aug 3 09:14:04 EDT 2009
Author: martinl
Date: 2009-08-03 09:14:03 -0400 (Mon, 03 Aug 2009)
New Revision: 38596
Modified:
grass/trunk/gui/wxpython/vdigit/line.cpp
grass/trunk/imagery/i.class/main.c
grass/trunk/imagery/i.group/main.c
grass/trunk/imagery/i.points/main.c
grass/trunk/imagery/i.target/main.c
grass/trunk/imagery/i.vpoints/main.c
grass/trunk/include/gisdefs.h
grass/trunk/lib/g3d/g3dregion.c
grass/trunk/lib/g3d/g3dwindowio.c
grass/trunk/lib/gis/file_name.c
grass/trunk/lib/gis/find_file.c
grass/trunk/lib/gis/find_vect.c
grass/trunk/lib/gis/legal_name.c
grass/trunk/lib/gis/nme_in_mps.c
grass/trunk/lib/gis/open.c
grass/trunk/lib/gis/open_misc.c
grass/trunk/lib/gis/remove.c
grass/trunk/lib/gis/rename.c
grass/trunk/lib/imagery/sigfile.c
grass/trunk/lib/manage/do_remove.c
grass/trunk/lib/raster/color_remove.c
grass/trunk/lib/raster/color_write.c
grass/trunk/lib/raster/quant_io.c
grass/trunk/lib/raster/quant_rw.c
grass/trunk/lib/vector/Vlib/legal_vname.c
grass/trunk/lib/vector/Vlib/map.c
grass/trunk/lib/vector/Vlib/open.c
grass/trunk/raster3d/r3.mkdspf/r3_find.c
grass/trunk/raster3d/r3.showdspf/r3_find.c
grass/trunk/vector/lidar/v.lidar.growing/main.c
grass/trunk/vector/v.out.ogr/main.c
Log:
gislib G__name_is_fully_qualified() renamed to
G_name_is_fully_qualified()
Modified: grass/trunk/gui/wxpython/vdigit/line.cpp
===================================================================
--- grass/trunk/gui/wxpython/vdigit/line.cpp 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/gui/wxpython/vdigit/line.cpp 2009-08-03 13:14:03 UTC (rev 38596)
@@ -891,7 +891,7 @@
nbgmaps = 0;
BgMap = NULL;
- if (!G__name_is_fully_qualified(bgmap, name, mapset)) {
+ if (!G_name_is_fully_qualified(bgmap, name, mapset)) {
strncpy(name, bgmap, GNAME_MAX);
mapset[0] = '\0';
}
Modified: grass/trunk/imagery/i.class/main.c
===================================================================
--- grass/trunk/imagery/i.class/main.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/imagery/i.class/main.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -136,7 +136,7 @@
- abort if not,
- remove @mapset part if it is
*/
- if (G__name_is_fully_qualified(img_grp->answer, group, grp_mapset)) {
+ if (G_name_is_fully_qualified(img_grp->answer, group, grp_mapset)) {
if (strcmp(grp_mapset, G_mapset()))
G_fatal_error(_("Group must exist in the current mapset"));
}
Modified: grass/trunk/imagery/i.group/main.c
===================================================================
--- grass/trunk/imagery/i.group/main.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/imagery/i.group/main.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -109,7 +109,7 @@
- abort if not,
- remove @mapset part if it is
*/
- if (G__name_is_fully_qualified(grp->answer, group, mapset)) {
+ if (G_name_is_fully_qualified(grp->answer, group, mapset)) {
if (strcmp(mapset, G_mapset()))
G_fatal_error(_("Group must exist in the current mapset"));
}
@@ -290,7 +290,7 @@
mapset = G_mapset();
/* Parse out mapset */
- if (G__name_is_fully_qualified(rasters[n], xname, xmapset)) {
+ if (G_name_is_fully_qualified(rasters[n], xname, xmapset)) {
strcpy(tmp_name, xname);
mapset = xmapset;
}
@@ -347,7 +347,7 @@
mapset = G_mapset();
/* Parse out mapset */
- if (G__name_is_fully_qualified(rasters[n], xname, xmapset)) {
+ if (G_name_is_fully_qualified(rasters[n], xname, xmapset)) {
strcpy(tmp_name, xname);
mapset = xmapset;
}
Modified: grass/trunk/imagery/i.points/main.c
===================================================================
--- grass/trunk/imagery/i.points/main.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/imagery/i.points/main.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -125,7 +125,7 @@
/* parse group name */
/* only enforce local-mapset-only due to I_get_group_ref() not liking "@mapset" */
- if (G__name_is_fully_qualified(grp->answer, group.name, xmapset)) {
+ if (G_name_is_fully_qualified(grp->answer, group.name, xmapset)) {
if (0 != strcmp(G_mapset(), xmapset))
G_fatal_error(_("[%s] Only local groups may be used"),
grp->answer);
Modified: grass/trunk/imagery/i.target/main.c
===================================================================
--- grass/trunk/imagery/i.target/main.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/imagery/i.target/main.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -74,7 +74,7 @@
- abort if not,
- remove @mapset part if it is
*/
- if (G__name_is_fully_qualified(group->answer, group_name, mapset_name)) {
+ if (G_name_is_fully_qualified(group->answer, group_name, mapset_name)) {
if (strcmp(mapset_name, G_mapset()))
G_fatal_error(_("Group must exist in the current mapset"));
}
Modified: grass/trunk/imagery/i.vpoints/main.c
===================================================================
--- grass/trunk/imagery/i.vpoints/main.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/imagery/i.vpoints/main.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -122,7 +122,7 @@
/* parse group name */
/* only enforce local-mapset-only due to I_get_group_ref() not liking "@mapset" */
- if (G__name_is_fully_qualified(grp->answer, group.name, xmapset)) {
+ if (G_name_is_fully_qualified(grp->answer, group.name, xmapset)) {
if (0 != strcmp(G_mapset(), xmapset))
G_fatal_error(_("[%s] Only local groups may be used"),
grp->answer);
Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/include/gisdefs.h 2009-08-03 13:14:03 UTC (rev 38596)
@@ -411,7 +411,7 @@
void G_newlines_to_spaces(char *);
/* nme_in_mps.c */
-int G__name_is_fully_qualified(const char *, char *, char *);
+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 *);
Modified: grass/trunk/lib/g3d/g3dregion.c
===================================================================
--- grass/trunk/lib/g3d/g3dregion.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/g3d/g3dregion.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -277,7 +277,7 @@
char fullName[GPATH_MAX];
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
- if (G__name_is_fully_qualified(name, xname, xmapset))
+ if (G_name_is_fully_qualified(name, xname, xmapset))
G3d_filename(fullName, G3D_HEADER_ELEMENT, xname, xmapset);
else {
if (!mapset || !*mapset)
Modified: grass/trunk/lib/g3d/g3dwindowio.c
===================================================================
--- grass/trunk/lib/g3d/g3dwindowio.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/g3d/g3dwindowio.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -75,7 +75,7 @@
return;
}
- if (G__name_is_fully_qualified(windowName, xname, xmapset)) {
+ if (G_name_is_fully_qualified(windowName, xname, xmapset)) {
G__file_name(path, G3D_WINDOW_DATABASE, xname, xmapset);
return;
}
@@ -103,7 +103,7 @@
while (*windowName == ' ') windowName++;
if ((*windowName != '/') && (*windowName != '.')) {
- if (G__name_is_fully_qualified (windowName, xname, xmapset))
+ if (G_name_is_fully_qualified (windowName, xname, xmapset))
G__file_name (path, G3D_WINDOW_DATABASE, xname, xmapset);
else
G__file_name (path, G3D_WINDOW_DATABASE, windowName, G_mapset ());
Modified: grass/trunk/lib/gis/file_name.c
===================================================================
--- grass/trunk/lib/gis/file_name.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/file_name.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -43,7 +43,7 @@
* must split the name into name, mapset if it is
* in the name at mapset format
*/
- if (name && *name && G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (name && *name && G_name_is_fully_qualified(name, xname, xmapset)) {
pname = xname;
sprintf(path, "%s/%s", location, xmapset);
}
@@ -82,7 +82,7 @@
* must split the name into name, mapset if it is
* in the name at mapset format
*/
- if (name && *name && G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (name && *name && G_name_is_fully_qualified(name, xname, xmapset)) {
pname = xname;
sprintf(path, "%s/%s", location, xmapset);
}
Modified: grass/trunk/lib/gis/find_file.c
===================================================================
--- grass/trunk/lib/gis/find_file.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/find_file.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -37,7 +37,7 @@
* if name is in the fully qualified format, split it into
* name, mapset (overrides what was in mapset)
*/
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
pname = xname;
pmapset = xmapset;
}
@@ -116,7 +116,7 @@
const char *pname, *pmapset;
const char *mp;
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
pname = xname;
pmapset = xmapset;
}
Modified: grass/trunk/lib/gis/find_vect.c
===================================================================
--- grass/trunk/lib/gis/find_vect.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/find_vect.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -81,7 +81,7 @@
const char *pname, *pmapset;
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
- if(G__name_is_fully_qualified(name, xname, xmapset)) {
+ if(G_name_is_fully_qualified(name, xname, xmapset)) {
pname = xname;
pmapset = xmapset;
}
Modified: grass/trunk/lib/gis/legal_name.c
===================================================================
--- grass/trunk/lib/gis/legal_name.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/legal_name.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -103,7 +103,7 @@
char nm[1000], ms[1000];
const char *in;
- if (G__name_is_fully_qualified(input, nm, ms)) {
+ if (G_name_is_fully_qualified(input, nm, ms)) {
in = nm;
}
else {
Modified: grass/trunk/lib/gis/nme_in_mps.c
===================================================================
--- grass/trunk/lib/gis/nme_in_mps.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/nme_in_mps.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -33,7 +33,7 @@
\return 1 if input map name is fully qualified
\return 0 if input map name is not fully qualified
*/
-int G__name_is_fully_qualified(const char *fullname, char *name, char *mapset)
+int G_name_is_fully_qualified(const char *fullname, char *name, char *mapset)
{
const char *p;
char *q;
@@ -128,7 +128,7 @@
int G_unqualified_name(const char *name, const char *mapset,
char *xname, char *xmapset)
{
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (mapset && *mapset && strcmp(mapset, xmapset) != 0)
return -1;
return 1;
Modified: grass/trunk/lib/gis/open.c
===================================================================
--- grass/trunk/lib/gis/open.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/open.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -57,7 +57,7 @@
/* READ */
if (mode == 0) {
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (*mapset && strcmp(xmapset, mapset) != 0) {
G_warning(_("G__open(read): mapset <%s> doesn't match xmapset <%s>"),
mapset, xmapset);
@@ -79,7 +79,7 @@
/* WRITE */
if (mode == 1 || mode == 2) {
mapset = G_mapset();
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, mapset) != 0) {
G_warning(_("G__open(write): xmapset <%s> != G_mapset() <%s>"),
xmapset, mapset);
Modified: grass/trunk/lib/gis/open_misc.c
===================================================================
--- grass/trunk/lib/gis/open_misc.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/open_misc.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -40,7 +40,7 @@
/* READ */
if (mode == 0) {
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (*mapset && strcmp(xmapset, mapset) != 0) {
G_warning(_("G__open_misc(read): mapset <%s> doesn't match xmapset <%s>"),
mapset, xmapset);
@@ -62,7 +62,7 @@
/* WRITE */
if (mode == 1 || mode == 2) {
mapset = G_mapset();
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, mapset) != 0) {
G_warning(_("G__open_misc(write): xmapset <%s> != G_mapset() <%s>"),
xmapset, mapset);
Modified: grass/trunk/lib/gis/remove.c
===================================================================
--- grass/trunk/lib/gis/remove.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/remove.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -77,7 +77,7 @@
/* name in mapset legal only if mapset is current mapset */
mapset = G_mapset();
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(mapset, xmapset) != 0)
return -1;
name = xname;
Modified: grass/trunk/lib/gis/rename.c
===================================================================
--- grass/trunk/lib/gis/rename.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/gis/rename.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -64,10 +64,10 @@
/* name in mapset legal only if mapset is current mapset */
mapset = G_mapset();
- if (G__name_is_fully_qualified(oldname, xname, xmapset)
+ if (G_name_is_fully_qualified(oldname, xname, xmapset)
&& strcmp(mapset, xmapset))
return -1;
- if (G__name_is_fully_qualified(newname, xname, xmapset)
+ if (G_name_is_fully_qualified(newname, xname, xmapset)
&& strcmp(mapset, xmapset))
return -1;
Modified: grass/trunk/lib/imagery/sigfile.c
===================================================================
--- grass/trunk/lib/imagery/sigfile.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/imagery/sigfile.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -31,7 +31,7 @@
char group_name[GNAME_MAX], group_mapset[GMAPSET_MAX];
FILE *fd;
- if (!G__name_is_fully_qualified(group, group_name, group_mapset)) {
+ if (!G_name_is_fully_qualified(group, group_name, group_mapset)) {
strcpy(group_name, group);
}
@@ -63,7 +63,7 @@
char group_name[GNAME_MAX], group_mapset[GMAPSET_MAX];
FILE *fd;
- if (!G__name_is_fully_qualified(group, group_name, group_mapset)) {
+ if (!G_name_is_fully_qualified(group, group_name, group_mapset)) {
strcpy(group_name, group);
}
Modified: grass/trunk/lib/manage/do_remove.c
===================================================================
--- grass/trunk/lib/manage/do_remove.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/manage/do_remove.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -25,7 +25,7 @@
hold_signals(1);
- if (G__name_is_fully_qualified(old, xname, xmapset)) {
+ if (G_name_is_fully_qualified(old, xname, xmapset)) {
if (strcmp(xmapset, G_mapset()) != 0)
G_fatal_error("%s is not in the current mapset (%s)", old,
G_mapset());
Modified: grass/trunk/lib/raster/color_remove.c
===================================================================
--- grass/trunk/lib/raster/color_remove.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/raster/color_remove.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -27,7 +27,7 @@
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
int stat;
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, mapset) != 0)
return -1;
name = xname;
Modified: grass/trunk/lib/raster/color_write.c
===================================================================
--- grass/trunk/lib/raster/color_write.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/raster/color_write.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -80,7 +80,7 @@
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
FILE *fd;
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, mapset) != 0)
return -1;
name = xname;
Modified: grass/trunk/lib/raster/quant_io.c
===================================================================
--- grass/trunk/lib/raster/quant_io.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/raster/quant_io.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -14,7 +14,7 @@
* mapset.
*
* returns: -2 if raster map is of type integer.
- * -1 if (! G__name_is_fully_qualified ()).
+ * -1 if (! G_name_is_fully_qualified ()).
* 0 if quantization file does not exist, or the file is empty,
* 1 if non-empty quantization file exists.
* read.
@@ -48,7 +48,7 @@
* The rules are written in decreasing order
* of priority (i.e. rules added earlier are written later).
*
- * returns: -1 if (! G__name_is_fully_qualified) or file could not be
+ * returns: -1 if (! G_name_is_fully_qualified) or file could not be
* opened.
* 1 otherwise.
*
@@ -128,7 +128,7 @@
return -2;
}
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, mapset) != 0)
return -1;
name = xname;
@@ -284,7 +284,7 @@
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
FILE *fd;
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, mapset) != 0)
return -1;
name = xname;
Modified: grass/trunk/lib/raster/quant_rw.c
===================================================================
--- grass/trunk/lib/raster/quant_rw.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/raster/quant_rw.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -213,7 +213,7 @@
* \param q
*
* \return -2 if raster map is of type integer
- * \return -1 if (!G__name_is_fully_qualified())
+ * \return -1 if (!G_name_is_fully_qualified())
* \return 0 if quantization file does not exist, or the file is empty or has wrong format
* \return 1 if non-empty quantization file exists
*
Modified: grass/trunk/lib/vector/Vlib/legal_vname.c
===================================================================
--- grass/trunk/lib/vector/Vlib/legal_vname.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/vector/Vlib/legal_vname.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -127,7 +127,7 @@
const char *in;
char nm[GNAME_MAX], ms[GMAPSET_MAX];
- if (G__name_is_fully_qualified(input, nm, ms)) {
+ if (G_name_is_fully_qualified(input, nm, ms)) {
in = nm;
}
else {
Modified: grass/trunk/lib/vector/Vlib/map.c
===================================================================
--- grass/trunk/lib/vector/Vlib/map.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/vector/Vlib/map.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -184,7 +184,7 @@
mapset = inmapset;
/* remove mapset from fully qualified name, confuses G__file_name() */
- if (G__name_is_fully_qualified(in, xname, xmapset)) {
+ if (G_name_is_fully_qualified(in, xname, xmapset)) {
in = xname;
}
@@ -326,7 +326,7 @@
}
/* remove mapset from fully qualified name */
- if (G__name_is_fully_qualified(in, xname, xmapset)) {
+ if (G_name_is_fully_qualified(in, xname, xmapset)) {
in = xname;
}
@@ -452,7 +452,7 @@
G_debug(3, "Delete vector '%s'", map);
/* remove mapset from fully qualified name */
- if (G__name_is_fully_qualified(map, xname, xmapset)) {
+ if (G_name_is_fully_qualified(map, xname, xmapset)) {
map = xname;
}
Modified: grass/trunk/lib/vector/Vlib/open.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/lib/vector/Vlib/open.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -150,7 +150,7 @@
dig_init_plus(&(Map->plus));
ogr_mapset = 0;
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, "OGR") == 0) {
/* unique OGR mapset detected */
G_debug(1, "OGR mapset detected");
@@ -557,7 +557,7 @@
ferror = Vect_get_fatal_error();
Vect_set_fatal_error(GV_FATAL_EXIT);
- if (G__name_is_fully_qualified(name, xname, xmapset)) {
+ if (G_name_is_fully_qualified(name, xname, xmapset)) {
if (strcmp(xmapset, G_mapset()) != 0) {
sprintf(errmsg, _("%s is not in the current mapset (%s)"), name,
G_mapset());
Modified: grass/trunk/raster3d/r3.mkdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_find.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/raster3d/r3.mkdspf/r3_find.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -18,7 +18,7 @@
strcpy(tofind, file);
- if (G__name_is_fully_qualified(cell, name, mapset))
+ if (G_name_is_fully_qualified(cell, name, mapset))
sprintf(element, "grid3/%s/dsp", name);
else
sprintf(element, "grid3/%s/dsp", cell);
Modified: grass/trunk/raster3d/r3.showdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/r3_find.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/raster3d/r3.showdspf/r3_find.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -19,7 +19,7 @@
strcpy(tofind, file);
- if (G__name_is_fully_qualified(cell, name, mapset))
+ if (G_name_is_fully_qualified(cell, name, mapset))
sprintf(element, "grid3/%s/dsp", name);
else
sprintf(element, "grid3/%s/dsp", cell);
Modified: grass/trunk/vector/lidar/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/main.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/vector/lidar/v.lidar.growing/main.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -122,7 +122,7 @@
/* Open input vector */
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
GV_FATAL_EXIT);
- if(G__name_is_fully_qualified(in_opt->answer, xname, xmapset) < 0 ) /* strip off mapset from input for SQL*/
+ if(G_name_is_fully_qualified(in_opt->answer, xname, xmapset) < 0 ) /* strip off mapset from input for SQL*/
G_fatal_error(_("Vector map <%s> not found"), xname);
if ((mapset = G_find_vector2(in_opt->answer, "")) == NULL) {
G_fatal_error(_("Vector map <%s> not found"), in_opt->answer);
Modified: grass/trunk/vector/v.out.ogr/main.c
===================================================================
--- grass/trunk/vector/v.out.ogr/main.c 2009-08-03 12:35:43 UTC (rev 38595)
+++ grass/trunk/vector/v.out.ogr/main.c 2009-08-03 13:14:03 UTC (rev 38596)
@@ -174,7 +174,7 @@
if (!layer_opt->answer) {
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
- if (G__name_is_fully_qualified(in_opt->answer, xname, xmapset))
+ if (G_name_is_fully_qualified(in_opt->answer, xname, xmapset))
layer_opt->answer = G_store(xname);
else
layer_opt->answer = G_store(in_opt->answer);
More information about the grass-commit
mailing list