[GRASS-SVN] r63868 - in grass/branches/releasebranch_7_0: . include/defs lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 29 12:22:41 PST 2014
Author: martinl
Date: 2014-12-29 12:22:41 -0800 (Mon, 29 Dec 2014)
New Revision: 63868
Added:
grass/branches/releasebranch_7_0/lib/gis/local_proto.h
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/include/defs/gis.h
grass/branches/releasebranch_7_0/lib/gis/error.c
grass/branches/releasebranch_7_0/lib/gis/get_window.c
grass/branches/releasebranch_7_0/lib/gis/gisinit.c
grass/branches/releasebranch_7_0/lib/gis/home.c
grass/branches/releasebranch_7_0/lib/gis/mapset_nme.c
grass/branches/releasebranch_7_0/lib/gis/open.c
grass/branches/releasebranch_7_0/lib/gis/open_misc.c
grass/branches/releasebranch_7_0/lib/gis/put_window.c
grass/branches/releasebranch_7_0/lib/gis/rd_cellhd.c
grass/branches/releasebranch_7_0/lib/gis/set_window.c
grass/branches/releasebranch_7_0/lib/gis/tempfile.c
Log:
move libgis-related G__ fns to local_proto.h
(merge r63865 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,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862
+ /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,63849,63851,63853,63855-63856,63858-63859,63862,63865
Modified: grass/branches/releasebranch_7_0/include/defs/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 20:22:41 UTC (rev 63868)
@@ -218,15 +218,12 @@
void G_setenv_nogisrc2(const char *, const char *, int);
void G_unsetenv(const char *);
void G_unsetenv2(const char *, int);
-void G__write_env(void);
const char *G_get_env_name(int);
-void G__read_env(void);
void G_set_gisrc_mode(int);
int G_get_gisrc_mode(void);
void G_create_alt_env(void);
void G_switch_env(void);
void G__read_mapset_env(void);
-void G__read_gisrc_env(void);
/* error.c */
jmp_buf *G_fatal_longjmp(int);
@@ -321,17 +318,14 @@
/* gisinit.c */
void G__gisinit(const char *, const char *);
void G__no_gisinit(const char *);
-void G__check_gisinit(void);
void G_init_all(void);
/* handler.c */
void G_add_error_handler(void (*)(void *), void *);
void G_remove_error_handler(void (*)(void *), void *);
-void G__call_error_handlers(void);
/* home.c */
const char *G_home(void);
-const char *G__home(void);
const char *G_config_path(void);
/* ilist.c */
@@ -423,9 +417,6 @@
void G_free_ls_filter(void *);
#endif
-/* mach_name.c */
-const char *G__machine_name(void);
-
/* make_loc.c */
int G_make_location(const char *, struct Cell_head *, const struct Key_Value *,
const struct Key_Value *);
@@ -451,7 +442,6 @@
/* mapset_nme.c */
const char *G_get_mapset_name(int);
-void G__get_list_of_mapsets(void);
void G_create_alt_search_path(void);
void G_switch_search_path(void);
void G_reset_mapsets(void);
@@ -669,7 +659,6 @@
void G_set_timestamp(struct TimeStamp *, const struct DateTime *);
void G_set_timestamp_range(struct TimeStamp *, const struct DateTime *,
const struct DateTime *);
-int G__read_timestamp(FILE *, struct TimeStamp *);
int G_write_timestamp(FILE *, const struct TimeStamp *);
void G_get_timestamps(const struct TimeStamp *, struct DateTime *, struct DateTime *, int *);
int G_format_timestamp(const struct TimeStamp *, char *);
Modified: grass/branches/releasebranch_7_0/lib/gis/error.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/error.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/error.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -21,6 +21,9 @@
#include <sys/types.h>
#include <grass/glocale.h>
#include <grass/gis.h>
+
+#include "local_proto.h"
+
/*!
* \def MSG
*
Modified: grass/branches/releasebranch_7_0/lib/gis/get_window.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/get_window.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/get_window.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -17,6 +17,7 @@
#include <grass/glocale.h>
#include "G.h"
+#include "local_proto.h"
static struct state {
int initialized;
Modified: grass/branches/releasebranch_7_0/lib/gis/gisinit.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/gisinit.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/gisinit.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -24,6 +24,7 @@
#include <grass/glocale.h>
#include "G.h"
+#include "local_proto.h"
struct G__ G__;
Modified: grass/branches/releasebranch_7_0/lib/gis/home.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/home.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/home.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -16,6 +16,8 @@
#include <grass/gis.h>
#include <grass/glocale.h>
+#include "local_proto.h"
+
/*!
* \brief Get user's home directory
*
Copied: grass/branches/releasebranch_7_0/lib/gis/local_proto.h (from rev 63865, grass/trunk/lib/gis/local_proto.h)
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/local_proto.h (rev 0)
+++ grass/branches/releasebranch_7_0/lib/gis/local_proto.h 2014-12-29 20:22:41 UTC (rev 63868)
@@ -0,0 +1,27 @@
+#ifndef __LOCAL_PROTO_H__
+#define __LOCAL_PROTO_H__
+
+/* env.c */
+void G__read_env(void);
+void G__write_env(void);
+void G__read_gisrc_env(void);
+
+/* gisinit.c */
+void G__check_gisinit(void);
+
+/* handler.c */
+void G__call_error_handlers(void);
+
+/* home.c */
+const char *G__home(void);
+
+/* mach_name.c */
+const char *G__machine_name(void);
+
+/* mapset_nme.c */
+void G__get_list_of_mapsets(void);
+
+/* timestamp.c */
+int G__read_timestamp(FILE *, struct TimeStamp *);
+
+#endif /* LOCAL_PROTO_H__ */
Modified: grass/branches/releasebranch_7_0/lib/gis/mapset_nme.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/mapset_nme.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/mapset_nme.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -17,6 +17,8 @@
#include <unistd.h>
#include <grass/gis.h>
+#include "local_proto.h"
+
static struct state {
struct list {
char **names;
Modified: grass/branches/releasebranch_7_0/lib/gis/open.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/open.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/open.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -22,6 +22,8 @@
#include <grass/gis.h>
#include <grass/glocale.h>
+#include "local_proto.h"
+
/*!
\brief Lowest level open routine.
Modified: grass/branches/releasebranch_7_0/lib/gis/open_misc.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/open_misc.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/open_misc.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -29,6 +29,8 @@
#include <grass/gis.h>
#include <grass/glocale.h>
+#include "local_proto.h"
+
static int G__open_misc(const char *dir,
const char *element,
const char *name, const char *mapset, int mode)
Modified: grass/branches/releasebranch_7_0/lib/gis/put_window.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/put_window.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/put_window.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -14,6 +14,8 @@
#include <stdlib.h>
#include <grass/gis.h>
+#include "local_proto.h"
+
/*!
* \brief Writes the region (window)
*
Modified: grass/branches/releasebranch_7_0/lib/gis/rd_cellhd.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/rd_cellhd.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/rd_cellhd.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -16,6 +16,8 @@
#include <grass/gis.h>
#include <grass/glocale.h>
+#include "local_proto.h"
+
static int scan_item(const char *, char *, char *);
static int scan_int(const char *, int *);
static double scan_double(const char *, double *);
Modified: grass/branches/releasebranch_7_0/lib/gis/set_window.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/set_window.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/set_window.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -16,6 +16,8 @@
#include "G.h"
+#include "local_proto.h"
+
/*!
\brief Get the current working window (region)
Modified: grass/branches/releasebranch_7_0/lib/gis/tempfile.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/tempfile.c 2014-12-29 20:18:22 UTC (rev 63867)
+++ grass/branches/releasebranch_7_0/lib/gis/tempfile.c 2014-12-29 20:22:41 UTC (rev 63868)
@@ -16,6 +16,8 @@
#include <sys/stat.h>
#include <grass/gis.h>
+#include "local_proto.h"
+
static struct Counter unique;
static int initialized;
More information about the grass-commit
mailing list