[GRASS-SVN] r63838 - in grass/trunk: general/g.list general/g.mapset general/g.mapsets general/g.setproj imagery/i.ortho.photo/i.ortho.elev imagery/i.ortho.photo/i.ortho.rectify imagery/i.rectify raster/r.in.gdal raster/r.proj vector/v.proj vector/v.rectify
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 29 11:00:14 PST 2014
Author: martinl
Date: 2014-12-29 11:00:13 -0800 (Mon, 29 Dec 2014)
New Revision: 63838
Modified:
grass/trunk/general/g.list/main.c
grass/trunk/general/g.mapset/main.c
grass/trunk/general/g.mapsets/main.c
grass/trunk/general/g.setproj/main.c
grass/trunk/imagery/i.ortho.photo/i.ortho.elev/main.c
grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c
grass/trunk/imagery/i.rectify/target.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.proj/main.c
grass/trunk/vector/v.proj/main.c
grass/trunk/vector/v.rectify/target.c
Log:
update to r63837
Modified: grass/trunk/general/g.list/main.c
===================================================================
--- grass/trunk/general/g.list/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/general/g.list/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -300,7 +300,7 @@
}
else if (strcmp(mapset, ".") == 0)
mapset = G_mapset();
- else if (G__mapset_permissions(mapset) == -1)
+ else if (G_mapset_permissions(mapset) == -1)
G_fatal_error(_("Mapset <%s> does not exist"), mapset);
G_add_mapset_to_search_path(mapset);
}
Modified: grass/trunk/general/g.mapset/main.c
===================================================================
--- grass/trunk/general/g.mapset/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/general/g.mapset/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -131,7 +131,7 @@
ms = G_get_available_mapsets();
for (nmapsets = 0; ms[nmapsets]; nmapsets++) {
- if (G__mapset_permissions(ms[nmapsets]) > 0) {
+ if (G_mapset_permissions(ms[nmapsets]) > 0) {
fprintf(stdout, "%s ", ms[nmapsets]);
}
}
@@ -152,7 +152,7 @@
/* Check if the mapset exists and user is owner */
G_debug(2, "check : %s", mapset_new_path);
- ret = G__mapset_permissions2(gisdbase_new, location_new, mapset_new);
+ ret = G_mapset_permissions2(gisdbase_new, location_new, mapset_new);
switch (ret) {
case 0:
G_fatal_error(_("You don't have permission to use the mapset <%s>"),
Modified: grass/trunk/general/g.mapsets/main.c
===================================================================
--- grass/trunk/general/g.mapsets/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/general/g.mapsets/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -170,7 +170,7 @@
cur_found = FALSE;
for (ptr = opt.mapset->answers; *ptr != NULL; ptr++) {
mapset = substitute_mapset(*ptr);
- if (G__mapset_permissions(mapset) < 0)
+ if (G_mapset_permissions(mapset) < 0)
G_fatal_error(_("Mapset <%s> not found"), mapset);
if (strcmp(mapset, cur_mapset) == 0)
cur_found = TRUE;
@@ -204,7 +204,7 @@
continue;
}
- if (G__mapset_permissions(mapset) < 0)
+ if (G_mapset_permissions(mapset) < 0)
G_fatal_error(_("Mapset <%s> not found"), mapset);
else
G_verbose_message(_("Mapset <%s> added to search path"),
Modified: grass/trunk/general/g.setproj/main.c
===================================================================
--- grass/trunk/general/g.setproj/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/general/g.setproj/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -96,7 +96,7 @@
/* get the output projection parameters, if existing */
/* Check for ownership here */
- stat = G__mapset_permissions(set_name);
+ stat = G_mapset_permissions(set_name);
if (stat == 0) {
G_fatal_error(_("PERMANENT: permission denied"));
}
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.elev/main.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.elev/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.elev/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -124,7 +124,7 @@
G_create_alt_env();
G_setenv_nogisrc("LOCATION_NAME", location);
- stat = G__mapset_permissions(mapset);
+ stat = G_mapset_permissions(mapset);
if (stat > 0) {
G_setenv_nogisrc("MAPSET", mapset);
G_create_alt_search_path();
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/target.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -21,7 +21,7 @@
}
select_target_env();
G_setenv_nogisrc("LOCATION_NAME", location);
- stat = G__mapset_permissions(mapset);
+ stat = G_mapset_permissions(mapset);
if (stat > 0) {
G_setenv_nogisrc("MAPSET", mapset);
G_get_window(&target_window);
Modified: grass/trunk/imagery/i.rectify/target.c
===================================================================
--- grass/trunk/imagery/i.rectify/target.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/imagery/i.rectify/target.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -22,7 +22,7 @@
}
select_target_env();
G_setenv_nogisrc("LOCATION_NAME", location);
- stat = G__mapset_permissions(mapset);
+ stat = G_mapset_permissions(mapset);
if (stat > 0) {
G_setenv_nogisrc("MAPSET", mapset);
G_get_window(&target_window);
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/raster/r.in.gdal/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -652,7 +652,7 @@
G_setenv_nogisrc("LOCATION_NAME", parm.target->answer);
sprintf(target_mapset, "PERMANENT"); /* must exist */
- if (G__mapset_permissions(target_mapset) == -1) {
+ if (G_mapset_permissions(target_mapset) == -1) {
/* create target location later */
create_target = 1;
}
@@ -825,7 +825,7 @@
G_setenv_nogisrc("LOCATION_NAME", (char *)pszDstLoc);
sprintf(target_mapset, "PERMANENT"); /* to find PROJ_INFO */
- permissions = G__mapset_permissions(target_mapset);
+ permissions = G_mapset_permissions(target_mapset);
if (permissions >= 0) {
/* Get projection info from target location */
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/raster/r.proj/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -281,7 +281,7 @@
G_setenv_nogisrc("GISDBASE", indbase->answer ? indbase->answer : G_gisdbase());
G_setenv_nogisrc("LOCATION_NAME", inlocation->answer);
- permissions = G__mapset_permissions(setname);
+ permissions = G_mapset_permissions(setname);
if (permissions < 0) /* can't access mapset */
G_fatal_error(_("Mapset <%s> in input location <%s> - %s"),
setname, inlocation->answer,
Modified: grass/trunk/vector/v.proj/main.c
===================================================================
--- grass/trunk/vector/v.proj/main.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/vector/v.proj/main.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -182,7 +182,7 @@
select_target_env();
G_setenv_nogisrc("GISDBASE", gbase);
G_setenv_nogisrc("LOCATION_NAME", iloc_name);
- stat = G__mapset_permissions(iset_name);
+ stat = G_mapset_permissions(iset_name);
if (stat >= 0) { /* yes, we can access the mapset */
/* if requested, list the vector maps in source location - MN 5/2001 */
Modified: grass/trunk/vector/v.rectify/target.c
===================================================================
--- grass/trunk/vector/v.rectify/target.c 2014-12-29 18:58:23 UTC (rev 63837)
+++ grass/trunk/vector/v.rectify/target.c 2014-12-29 19:00:13 UTC (rev 63838)
@@ -31,7 +31,7 @@
}
select_target_env();
G_setenv_nogisrc("LOCATION_NAME", location);
- stat = G__mapset_permissions(mapset);
+ stat = G_mapset_permissions(mapset);
if (stat > 0) {
G_setenv_nogisrc("MAPSET", mapset);
select_current_env();
More information about the grass-commit
mailing list