[GRASS-SVN] r63837 - in grass/trunk: include/defs lib/gis lib/temporal/lib

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 10:58:23 -0800 (Mon, 29 Dec 2014)
New Revision: 63837

Modified:
   grass/trunk/include/defs/gis.h
   grass/trunk/lib/gis/gisinit.c
   grass/trunk/lib/gis/mapset_msc.c
   grass/trunk/lib/gis/mapset_nme.c
   grass/trunk/lib/temporal/lib/connect.c
Log:
libgis: G__mapset_permissions -> G_mapset_permissions


Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h	2014-12-29 18:49:58 UTC (rev 63836)
+++ grass/trunk/include/defs/gis.h	2014-12-29 18:58:23 UTC (rev 63837)
@@ -446,8 +446,8 @@
 /* mapset_msc.c */
 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 *);
+int G_mapset_permissions(const char *);
+int G_mapset_permissions2(const char *, const char *, const char *);
 
 /* mapset_nme.c */
 const char *G_get_mapset_name(int);

Modified: grass/trunk/lib/gis/gisinit.c
===================================================================
--- grass/trunk/lib/gis/gisinit.c	2014-12-29 18:49:58 UTC (rev 63836)
+++ grass/trunk/lib/gis/gisinit.c	2014-12-29 18:58:23 UTC (rev 63837)
@@ -57,7 +57,7 @@
     /* Make sure location and mapset are set */
     G_location_path();
     mapset = G_mapset();
-    switch (G__mapset_permissions(mapset)) {
+    switch (G_mapset_permissions(mapset)) {
     case 1:
 	break;
     case 0:

Modified: grass/trunk/lib/gis/mapset_msc.c
===================================================================
--- grass/trunk/lib/gis/mapset_msc.c	2014-12-29 18:49:58 UTC (rev 63836)
+++ grass/trunk/lib/gis/mapset_msc.c	2014-12-29 18:58:23 UTC (rev 63837)
@@ -113,7 +113,7 @@
    \return 0 mapset exists, BUT user denied permission
    \return -1 mapset does not exist
  */
-int G__mapset_permissions(const char *mapset)
+int G_mapset_permissions(const char *mapset)
 {
     char path[GPATH_MAX];
     struct stat info;
@@ -142,7 +142,7 @@
    \return 0 mapset exists, BUT user denied permission
    \return -1 mapset does not exist
  */
-int G__mapset_permissions2(const char *gisdbase, const char *location,
+int G_mapset_permissions2(const char *gisdbase, const char *location,
 			   const char *mapset)
 {
     char path[GPATH_MAX];

Modified: grass/trunk/lib/gis/mapset_nme.c
===================================================================
--- grass/trunk/lib/gis/mapset_nme.c	2014-12-29 18:49:58 UTC (rev 63836)
+++ grass/trunk/lib/gis/mapset_nme.c	2014-12-29 18:58:23 UTC (rev 63837)
@@ -73,14 +73,14 @@
 	while (fscanf(fp, "%s", name) == 1) {
 	    if (strcmp(name, cur) == 0)
 		continue;
-	    if (G__mapset_permissions(name) >= 0)
+	    if (G_mapset_permissions(name) >= 0)
 		new_mapset(name);
 	}
 	fclose(fp);
     }
     else {
 	static const char perm[] = "PERMANENT";
-	if (strcmp(perm, cur) != 0 && G__mapset_permissions(perm) >= 0)
+	if (strcmp(perm, cur) != 0 && G_mapset_permissions(perm) >= 0)
 	    new_mapset(perm);
     }
 }

Modified: grass/trunk/lib/temporal/lib/connect.c
===================================================================
--- grass/trunk/lib/temporal/lib/connect.c	2014-12-29 18:49:58 UTC (rev 63836)
+++ grass/trunk/lib/temporal/lib/connect.c	2014-12-29 18:58:23 UTC (rev 63837)
@@ -95,7 +95,7 @@
     const char *location = G_getenv_nofatal("LOCATION_NAME");
     int ret;
 
-    ret = G__mapset_permissions2(gisdbase, location, mapset);
+    ret = G_mapset_permissions2(gisdbase, location, mapset);
     switch (ret) {
     case 0:
         G_warning(_("You don't have permission to access the mapset <%s>"),