[GRASS-SVN] r63827 - in grass/trunk: include/defs lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 09:09:54 -0800 (Mon, 29 Dec 2014)
New Revision: 63827

Modified:
   grass/trunk/include/defs/gis.h
   grass/trunk/lib/gis/make_loc.c
   grass/trunk/lib/gis/make_mapset.c
   grass/trunk/lib/gis/put_window.c
Log:
libgis: G__put_window() -> G_put_element_window()


Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h	2014-12-29 16:50:16 UTC (rev 63826)
+++ grass/trunk/include/defs/gis.h	2014-12-29 17:09:54 UTC (rev 63827)
@@ -588,7 +588,7 @@
 
 /* put_window.c */
 int G_put_window(const struct Cell_head *);
-int G__put_window(const struct Cell_head *, const char *, const char *);
+int G_put_element_window(const struct Cell_head *, const char *, const char *);
 
 /* putenv.c */
 void G_putenv(const char *, const char *);

Modified: grass/trunk/lib/gis/make_loc.c
===================================================================
--- grass/trunk/lib/gis/make_loc.c	2014-12-29 16:50:16 UTC (rev 63826)
+++ grass/trunk/lib/gis/make_loc.c	2014-12-29 17:09:54 UTC (rev 63827)
@@ -75,8 +75,8 @@
     G__setenv("MAPSET", "PERMANENT");
 
     /* Create the default, and current window files */
-    G__put_window(wind, "", "DEFAULT_WIND");
-    G__put_window(wind, "", "WIND");
+    G_put_element_window(wind, "", "DEFAULT_WIND");
+    G_put_element_window(wind, "", "WIND");
 
     /* Write out the PROJ_INFO, and PROJ_UNITS if available. */
     if (proj_info != NULL) {

Modified: grass/trunk/lib/gis/make_mapset.c
===================================================================
--- grass/trunk/lib/gis/make_mapset.c	2014-12-29 16:50:16 UTC (rev 63826)
+++ grass/trunk/lib/gis/make_mapset.c	2014-12-29 17:09:54 UTC (rev 63827)
@@ -83,7 +83,7 @@
     G__setenv("MAPSET", mapset_name);
 
     /* Copy default window/regions to new mapset */
-    G__put_window(&default_window, "", "WIND");
+    G_put_element_window(&default_window, "", "WIND");
 
     /* And switch back to original environment */
     G_switch_env();

Modified: grass/trunk/lib/gis/put_window.c
===================================================================
--- grass/trunk/lib/gis/put_window.c	2014-12-29 16:50:16 UTC (rev 63826)
+++ grass/trunk/lib/gis/put_window.c	2014-12-29 17:09:54 UTC (rev 63827)
@@ -15,9 +15,9 @@
 #include <grass/gis.h>
 
 /*!
- * \brief Writes the database region (window)
+ * \brief Writes the region (window)
  *
- * Writes the database region file (WIND) in the user's current mapset
+ * Writes the region file (WIND) in the user's current mapset
  * or when environmental variable \c WIND_OVERRIDE is set,
  * it writes the region to file specified by \c WIND_OVERRIDE variable.
  *
@@ -26,7 +26,7 @@
  * Otherwise the whole GRASS session is affected.
  *
  * \warning When environmental variable \c WIND_OVERRIDE is not set,
- * this routine actually changes the database region.
+ * this routine actually changes the region.
  * So in this case it should only be called by modules which the user knows
  * will change the region. It is probably fair to say that only the
  * \gmod{g.region} should call this routine unless \c WIND_OVERRIDE is set.
@@ -45,17 +45,17 @@
 {
     char *wind = getenv("WIND_OVERRIDE");
 
-    return wind ? G__put_window(window, "windows", wind)
-	: G__put_window(window, "", "WIND");
+    return wind ? G_put_element_window(window, "windows", wind)
+	: G_put_element_window(window, "", "WIND");
 }
 
 /*!
- * \brief Write the database region
+ * \brief Write the region
  *
- * Writes the database region file (WIND) in the user's current mapset
+ * Writes the region file (WIND) in the user's current mapset
  * from region. 
 
- * <b>Warning:</b> Since this routine actually changes the database
+ * <b>Warning:</b> Since this routine actually changes the 
  * region, it should only be called by modules which the user knows
  * will change the region. It is probably fair to say that only the
  * <tt>g.region</tt> should call this routine.
@@ -69,7 +69,7 @@
  *
  * \sa G_put_window()
  */
-int G__put_window(const struct Cell_head *window, const char *dir, const char *name)
+int G_put_element_window(const struct Cell_head *window, const char *dir, const char *name)
 {
     FILE *fd;