[GRASS-SVN] r63848 - in grass/branches/releasebranch_7_0: . general/g.filename include/defs lib/db/dbmi_base lib/gis lib/manage lib/raster lib/raster3d lib/vector/Vlib
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 29 11:14:01 PST 2014
Author: martinl
Date: 2014-12-29 11:14:01 -0800 (Mon, 29 Dec 2014)
New Revision: 63848
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.filename/main.c
grass/branches/releasebranch_7_0/include/defs/gis.h
grass/branches/releasebranch_7_0/lib/db/dbmi_base/default_name.c
grass/branches/releasebranch_7_0/lib/gis/mapset_msc.c
grass/branches/releasebranch_7_0/lib/gis/open.c
grass/branches/releasebranch_7_0/lib/gis/tempfile.c
grass/branches/releasebranch_7_0/lib/manage/do_copy.c
grass/branches/releasebranch_7_0/lib/raster/close.c
grass/branches/releasebranch_7_0/lib/raster/gdal.c
grass/branches/releasebranch_7_0/lib/raster/open.c
grass/branches/releasebranch_7_0/lib/raster/quant_io.c
grass/branches/releasebranch_7_0/lib/raster3d/mapset.c
grass/branches/releasebranch_7_0/lib/vector/Vlib/map.c
Log:
libgis: G__make_mapset_element() -> G_make_mapset_element()
update modules
(merge r63846-7 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,63837-63839,63841,63843-63844
+ /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-63839,63841,63843-63844,63846-63847
Modified: grass/branches/releasebranch_7_0/general/g.filename/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.filename/main.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/general/g.filename/main.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -76,7 +76,7 @@
if (strcmp(mapset, ".") == 0 || strcmp(mapset, "") == 0)
mapset = G_mapset();
- G__make_mapset_element(element);
+ G_make_mapset_element(element);
G_file_name(path, element, name, mapset);
fprintf(stdout, "file='%s'\n", path);
Modified: grass/branches/releasebranch_7_0/include/defs/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 19:14:01 UTC (rev 63848)
@@ -444,7 +444,7 @@
char *G_mapset_path(void);
/* mapset_msc.c */
-int G__make_mapset_element(const char *);
+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 *);
Modified: grass/branches/releasebranch_7_0/lib/db/dbmi_base/default_name.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/dbmi_base/default_name.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/db/dbmi_base/default_name.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -108,7 +108,7 @@
db_set_connection(&connection);
sprintf(buf, "%s/%s/dbf", G_location_path(), G_mapset());
- G__make_mapset_element("dbf");
+ G_make_mapset_element("dbf");
}
else if (strcmp(DB_DEFAULT_DRIVER, "sqlite") == 0) {
/* Set default values and create sqlite db dir */
@@ -129,7 +129,7 @@
*/
connection.databaseName =
"$GISDBASE/$LOCATION_NAME/$MAPSET/sqlite/sqlite.db";
- G__make_mapset_element("sqlite");
+ G_make_mapset_element("sqlite");
db_set_connection(&connection);
}
else
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:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/gis/mapset_msc.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -32,7 +32,7 @@
\return 0 ?
\return ?
*/
-int G__make_mapset_element(const char *p_element)
+int G_make_mapset_element(const char *p_element)
{
char path[GPATH_MAX];
char *p;
@@ -85,7 +85,7 @@
char buf[GNAME_MAX * 2 + 1];
sprintf(buf, "%s/%s", dir, name);
- return G__make_mapset_element(buf);
+ return G_make_mapset_element(buf);
}
static int check_owner(const struct stat *info)
Modified: grass/branches/releasebranch_7_0/lib/gis/open.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/open.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/gis/open.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -99,7 +99,7 @@
G_file_name(path, element, name, mapset);
if (mode == 1 || access(path, 0) != 0) {
- G__make_mapset_element(element);
+ G_make_mapset_element(element);
close(open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666));
}
Modified: grass/branches/releasebranch_7_0/lib/gis/tempfile.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/tempfile.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/gis/tempfile.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -103,5 +103,5 @@
strcat(element, "/");
strcat(element, machine);
}
- G__make_mapset_element(element);
+ G_make_mapset_element(element);
}
Modified: grass/branches/releasebranch_7_0/lib/manage/do_copy.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/do_copy.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/manage/do_copy.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -54,7 +54,7 @@
}
else {
for (i = 0; i < list[n].nelem; i++) {
- G__make_mapset_element(list[n].element[i]);
+ G_make_mapset_element(list[n].element[i]);
G_file_name(path, list[n].element[i], old, mapset);
if (access(path, 0) != 0) {
G_remove(list[n].element[i], new);
Modified: grass/branches/releasebranch_7_0/lib/raster/close.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster/close.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/raster/close.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -280,7 +280,7 @@
remove(path);
/* write 0-length cell file */
- G__make_mapset_element("cell");
+ G_make_mapset_element("cell");
G_file_name(path, "cell", fcb->name, fcb->mapset);
cell_fd = creat(path, 0666);
close(cell_fd);
@@ -289,7 +289,7 @@
write_fp_format(fd);
/* write 0-length fcell file */
- G__make_mapset_element("fcell");
+ G_make_mapset_element("fcell");
G_file_name(path, "fcell", fcb->name, fcb->mapset);
cell_fd = creat(path, 0666);
close(cell_fd);
@@ -395,7 +395,7 @@
write_fp_format(fd);
/* now write 0-length cell file */
- G__make_mapset_element("cell");
+ G_make_mapset_element("cell");
cell_fd =
creat(G_file_name(path, "cell", fcb->name, fcb->mapset),
0666);
Modified: grass/branches/releasebranch_7_0/lib/raster/gdal.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster/gdal.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/raster/gdal.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -384,7 +384,7 @@
G_file_name(path, p, "", G_mapset());
st->opts.dir = G_store(path);
if (access(path, 0) != 0)
- G__make_mapset_element(p);
+ G_make_mapset_element(p);
}
p = G_find_key_value("extension", key_val);
Modified: grass/branches/releasebranch_7_0/lib/raster/open.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster/open.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/raster/open.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -603,7 +603,7 @@
* since we are bypassing the normal open logic
* must create the cell element
*/
- G__make_mapset_element(cell_dir);
+ G_make_mapset_element(cell_dir);
/* mark closed */
fcb->map_type = map_type;
Modified: grass/branches/releasebranch_7_0/lib/raster/quant_io.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster/quant_io.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/raster/quant_io.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -287,7 +287,7 @@
else {
sprintf(element, "quant2/%s", mapset);
G_remove(element, name);
- G__make_mapset_element(element);
+ G_make_mapset_element(element);
if (!(fd = G_fopen_new(element, name)))
return -1;
}
Modified: grass/branches/releasebranch_7_0/lib/raster3d/mapset.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster3d/mapset.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/raster3d/mapset.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -11,5 +11,5 @@
char buf[GNAME_MAX + sizeof(RASTER3D_DIRECTORY) + 2];
sprintf(buf, "%s/%s", RASTER3D_DIRECTORY, mapName);
- G__make_mapset_element(buf);
+ G_make_mapset_element(buf);
}
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/map.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/map.c 2014-12-29 19:12:43 UTC (rev 63847)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/map.c 2014-12-29 19:14:01 UTC (rev 63848)
@@ -129,9 +129,9 @@
}
/* Copy the directory */
- G__make_mapset_element(GV_DIRECTORY);
+ G_make_mapset_element(GV_DIRECTORY);
sprintf(buf, "%s/%s", GV_DIRECTORY, out);
- G__make_mapset_element(buf);
+ G_make_mapset_element(buf);
i = 0;
while (files[i]) {
More information about the grass-commit
mailing list