gnue/geas/src connection.c dataobject.c geas-se...

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/05/25 13:24:08

Modified files:
        geas/src       : connection.c dataobject.c geas-server.c 
                         geas-server.h objectlist.c security.c 
        geas/src/config: configuration.c configuration.h 
        geas/src/objectcache: objectcache.c 
        geas/src/objectstore: objectstore.c 
Added files:
        geas/src       : globals.h 

Log message:
        even more cleanups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/globals.h?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/connection.c.diff?cvsroot=OldCVS&tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/dataobject.c.diff?cvsroot=OldCVS&tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.c.diff?cvsroot=OldCVS&tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.h.diff?cvsroot=OldCVS&tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectlist.c.diff?cvsroot=OldCVS&tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/security.c.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/config/configuration.c.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/config/configuration.h.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectcache/objectcache.c.diff?cvsroot=OldCVS&tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/objectstore.c.diff?cvsroot=OldCVS&tr1=1.57&tr2=1.58&r1=text&r2=text

Patches:
Index: gnue/geas/src/config/configuration.c
diff -u gnue/geas/src/config/configuration.c:1.8 
gnue/geas/src/config/configuration.c:1.9
--- gnue/geas/src/config/configuration.c:1.8    Fri May 25 08:46:50 2001
+++ gnue/geas/src/config/configuration.c        Fri May 25 13:24:07 2001
@@ -67,6 +67,8 @@
    }
 configuration_data;
 
+configuration configdata = NO_CONFIGURATION;
+
 static int config_failed = 0;
 
 /* private functions */
Index: gnue/geas/src/config/configuration.h
diff -u gnue/geas/src/config/configuration.h:1.3 
gnue/geas/src/config/configuration.h:1.4
--- gnue/geas/src/config/configuration.h:1.3    Wed Jan 10 18:13:48 2001
+++ gnue/geas/src/config/configuration.h        Fri May 25 13:24:08 2001
@@ -35,6 +35,8 @@
 /* handle to configuration data */
 typedef void *configuration;
 
+extern configuration configdata;
+
 #define NO_CONFIGURATION NULL
 
 /* load/release configuration files */
Index: gnue/geas/src/connection.c
diff -u gnue/geas/src/connection.c:1.53 gnue/geas/src/connection.c:1.54
--- gnue/geas/src/connection.c:1.53     Fri May 25 13:04:54 2001
+++ gnue/geas/src/connection.c  Fri May 25 13:24:07 2001
@@ -34,6 +34,7 @@
 #include "oql/oql.h"
 #include "objectcache/objectcache.h"
 #include "datamonitor/datamonitor.h"
+#include "config/configuration.h"
 #include "transaction.h"
 #include "schema.h"
 
Index: gnue/geas/src/dataobject.c
diff -u gnue/geas/src/dataobject.c:1.50 gnue/geas/src/dataobject.c:1.51
--- gnue/geas/src/dataobject.c:1.50     Fri May 25 08:46:50 2001
+++ gnue/geas/src/dataobject.c  Fri May 25 13:24:07 2001
@@ -37,6 +37,7 @@
 #include "collectiondata.h"
 #include "methods/methods.h"
 #include "datamonitor/datamonitor.h"
+#include "config/configuration.h"
 #include "transaction.h"
 #include "schema.h"
 
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.84 gnue/geas/src/geas-server.c:1.85
--- gnue/geas/src/geas-server.c:1.84    Fri May 25 13:04:54 2001
+++ gnue/geas/src/geas-server.c Fri May 25 13:24:07 2001
@@ -82,7 +82,6 @@
 int debuglevel;
 CORBA_ORB the_orb;
 struct ServerSettings settings;
-configuration configdata = NO_CONFIGURATION;
 odl_tree *all_classes = NULL;
 
 static GEAS_Connection server_connection_object = CORBA_OBJECT_NIL;
Index: gnue/geas/src/geas-server.h
diff -u gnue/geas/src/geas-server.h:1.41 gnue/geas/src/geas-server.h:1.42
--- gnue/geas/src/geas-server.h:1.41    Fri May 25 13:04:54 2001
+++ gnue/geas/src/geas-server.h Fri May 25 13:24:07 2001
@@ -37,10 +37,6 @@
 /* utility function prototypes */
 gboolean is_extension(char *filename, char *ext);
 
-#ifndef LIBCONFIG_H
-#include "config/configuration.h"
-#endif
-
 /* error messages */
 void do_fatal_error(char *file, int line,char *func, char *fmt, ...);
 
@@ -94,7 +90,6 @@
 extern int debuglevel;           /* configurable debugging output detail :
                             1-10, 1 = low detail, 10 = high detail */
 
-extern configuration configdata;
 extern odl_tree *all_classes;
 
 /* tracing functions */
Index: gnue/geas/src/objectcache/objectcache.c
diff -u gnue/geas/src/objectcache/objectcache.c:1.43 
gnue/geas/src/objectcache/objectcache.c:1.44
--- gnue/geas/src/objectcache/objectcache.c:1.43        Fri May 25 13:04:54 2001
+++ gnue/geas/src/objectcache/objectcache.c     Fri May 25 13:24:08 2001
@@ -27,6 +27,7 @@
 #include "geas-server.h"
 #include "objectcache.h"
 #include "objectstore/objectstore.h"
+#include "config/configuration.h"
 #include "oql/oql.h"
 
 /* ie, turn off temp. debug output */
Index: gnue/geas/src/objectlist.c
diff -u gnue/geas/src/objectlist.c:1.18 gnue/geas/src/objectlist.c:1.19
--- gnue/geas/src/objectlist.c:1.18     Fri May 25 13:04:54 2001
+++ gnue/geas/src/objectlist.c  Fri May 25 13:24:07 2001
@@ -29,6 +29,7 @@
 #include "geas.h"
 #include "objectlist.h"
 #include "objectcache/objectcache.h"
+#include "config/configuration.h"
 #include "exceptions.h"
 #include "collectiondata.h"
 
Index: gnue/geas/src/objectstore/objectstore.c
diff -u gnue/geas/src/objectstore/objectstore.c:1.57 
gnue/geas/src/objectstore/objectstore.c:1.58
--- gnue/geas/src/objectstore/objectstore.c:1.57        Fri May 25 13:04:55 2001
+++ gnue/geas/src/objectstore/objectstore.c     Fri May 25 13:24:08 2001
@@ -19,20 +19,18 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: objectstore.c,v 1.57 2001/05/25 20:04:55 reinhard Exp $
+   $Id: objectstore.c,v 1.58 2001/05/25 20:24:08 reinhard Exp $
 */
 
 #include "config.h"
-
+#include "objectstore.h"
 #include <stdio.h>
 #include <glib.h>
 #include <limits.h>
-
 #include "geas-server.h"
 #include "classdata.h"
 #include "objectcache/objectcache.h"
 #include "oql.h"
-#include "objectstore.h"
 #include "datamonitor/datamonitor.h"
 
 /* compile time hard limit */
Index: gnue/geas/src/security.c
diff -u gnue/geas/src/security.c:1.10 gnue/geas/src/security.c:1.11
--- gnue/geas/src/security.c:1.10       Fri May 25 13:04:54 2001
+++ gnue/geas/src/security.c    Fri May 25 13:24:07 2001
@@ -28,6 +28,7 @@
 #include "geas.h"
 #include "geas-server.h"
 #include "globals.h"
+#include "config/configuration.h"
 
 /** \brief Set up the security system
  * Called by the main function, when initialising the server. Currently