[GRASS-SVN] r63840 - in grass/branches/releasebranch_7_0: . 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 include/defs lib/gis lib/temporal/lib 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:03:58 PST 2014
Author: martinl
Date: 2014-12-29 11:03:58 -0800 (Mon, 29 Dec 2014)
New Revision: 63840
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.list/main.c
grass/branches/releasebranch_7_0/general/g.mapset/main.c
grass/branches/releasebranch_7_0/general/g.mapsets/main.c
grass/branches/releasebranch_7_0/general/g.setproj/main.c
grass/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.elev/main.c
grass/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.rectify/target.c
grass/branches/releasebranch_7_0/imagery/i.rectify/target.c
grass/branches/releasebranch_7_0/include/defs/gis.h
grass/branches/releasebranch_7_0/lib/gis/gisinit.c
grass/branches/releasebranch_7_0/lib/gis/mapset_msc.c
grass/branches/releasebranch_7_0/lib/gis/mapset_nme.c
grass/branches/releasebranch_7_0/lib/temporal/lib/connect.c
grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c
grass/branches/releasebranch_7_0/raster/r.proj/main.c
grass/branches/releasebranch_7_0/vector/v.proj/main.c
grass/branches/releasebranch_7_0/vector/v.rectify/target.c
Log:
libgis: G__mapset_permissions -> G_mapset_permissions
update modules
(merge r63837-8 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63838
Modified: grass/branches/releasebranch_7_0/general/g.list/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/general/g.mapset/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.mapset/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/general/g.mapset/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/general/g.mapsets/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.mapsets/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/general/g.mapsets/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/general/g.setproj/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.setproj/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/general/g.setproj/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.elev/main.c
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.elev/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.elev/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.rectify/target.c
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.rectify/target.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/imagery/i.ortho.photo/i.ortho.rectify/target.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/imagery/i.rectify/target.c
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.rectify/target.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/imagery/i.rectify/target.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/include/defs/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/lib/gis/gisinit.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/gisinit.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/lib/gis/gisinit.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/lib/gis/mapset_msc.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/mapset_msc.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/lib/gis/mapset_msc.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/lib/gis/mapset_nme.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/mapset_nme.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/lib/gis/mapset_nme.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/lib/temporal/lib/connect.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/temporal/lib/connect.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/lib/temporal/lib/connect.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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>"),
Modified: grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/raster/r.proj/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.proj/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/raster/r.proj/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/vector/v.proj/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.proj/main.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/vector/v.proj/main.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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/branches/releasebranch_7_0/vector/v.rectify/target.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.rectify/target.c 2014-12-29 19:03:15 UTC (rev 63839)
+++ grass/branches/releasebranch_7_0/vector/v.rectify/target.c 2014-12-29 19:03:58 UTC (rev 63840)
@@ -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