[GRASS-SVN] r63846 - in grass/trunk: 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:12:25 PST 2014
Author: martinl
Date: 2014-12-29 11:12:25 -0800 (Mon, 29 Dec 2014)
New Revision: 63846
Modified:
grass/trunk/include/defs/gis.h
grass/trunk/lib/db/dbmi_base/default_name.c
grass/trunk/lib/gis/mapset_msc.c
grass/trunk/lib/gis/open.c
grass/trunk/lib/gis/tempfile.c
grass/trunk/lib/manage/do_copy.c
grass/trunk/lib/raster/close.c
grass/trunk/lib/raster/gdal.c
grass/trunk/lib/raster/open.c
grass/trunk/lib/raster/quant_io.c
grass/trunk/lib/raster3d/mapset.c
grass/trunk/lib/vector/Vlib/map.c
Log:
libgis: G__make_mapset_element() -> G_make_mapset_element()
Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/include/defs/gis.h 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/db/dbmi_base/default_name.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/default_name.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/db/dbmi_base/default_name.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/gis/mapset_msc.c
===================================================================
--- grass/trunk/lib/gis/mapset_msc.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/gis/mapset_msc.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/gis/open.c
===================================================================
--- grass/trunk/lib/gis/open.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/gis/open.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/gis/tempfile.c
===================================================================
--- grass/trunk/lib/gis/tempfile.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/gis/tempfile.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -103,5 +103,5 @@
strcat(element, "/");
strcat(element, machine);
}
- G__make_mapset_element(element);
+ G_make_mapset_element(element);
}
Modified: grass/trunk/lib/manage/do_copy.c
===================================================================
--- grass/trunk/lib/manage/do_copy.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/manage/do_copy.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/raster/close.c
===================================================================
--- grass/trunk/lib/raster/close.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/raster/close.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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);
@@ -396,7 +396,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/trunk/lib/raster/gdal.c
===================================================================
--- grass/trunk/lib/raster/gdal.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/raster/gdal.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/raster/open.c
===================================================================
--- grass/trunk/lib/raster/open.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/raster/open.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/raster/quant_io.c
===================================================================
--- grass/trunk/lib/raster/quant_io.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/raster/quant_io.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/raster3d/mapset.c
===================================================================
--- grass/trunk/lib/raster3d/mapset.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/raster3d/mapset.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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/trunk/lib/vector/Vlib/map.c
===================================================================
--- grass/trunk/lib/vector/Vlib/map.c 2014-12-29 19:09:07 UTC (rev 63845)
+++ grass/trunk/lib/vector/Vlib/map.c 2014-12-29 19:12:25 UTC (rev 63846)
@@ -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