Browse Source

libgis: G__mapset_permissions -> G_mapset_permissions

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63837 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 năm trước cách đây
mục cha
commit
14f487d17b
5 tập tin đã thay đổi với 8 bổ sung8 xóa
  1. 2 2
      include/defs/gis.h
  2. 1 1
      lib/gis/gisinit.c
  3. 2 2
      lib/gis/mapset_msc.c
  4. 2 2
      lib/gis/mapset_nme.c
  5. 1 1
      lib/temporal/lib/connect.c

+ 2 - 2
include/defs/gis.h

@@ -446,8 +446,8 @@ char *G_mapset_path(void);
 /* 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);

+ 1 - 1
lib/gis/gisinit.c

@@ -57,7 +57,7 @@ void G__gisinit(const char *version, const char *pgm)
     /* 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:

+ 2 - 2
lib/gis/mapset_msc.c

@@ -113,7 +113,7 @@ static int check_owner(const struct stat *info)
    \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 @@ int G__mapset_permissions(const char *mapset)
    \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];

+ 2 - 2
lib/gis/mapset_nme.c

@@ -73,14 +73,14 @@ void G__get_list_of_mapsets(void)
 	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);
     }
 }

+ 1 - 1
lib/temporal/lib/connect.c

@@ -95,7 +95,7 @@ static char *get_mapset_connection_name(const char *mapset, int contype)
     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>"),