gnue/geas/src/methods methods.c methods.h metho...

[Neil Tiffin]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/09/14 21:47:25

Modified files:
        geas/src/methods: methods.c methods.h methods_glibmodule.c 
                          methods_glibmodule.h methods_python.c 

Log message:
        Checkin incomplete method changes, they dont compile and i'm too tired 
to figure it out.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.c.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.h.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_glibmodule.c.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_glibmodule.h.diff?cvsroot=OldCVS&tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_python.c.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/geas/src/methods/methods.c
diff -u gnue/geas/src/methods/methods.c:1.12 
gnue/geas/src/methods/methods.c:1.13
--- gnue/geas/src/methods/methods.c:1.12        Fri Sep 14 20:20:18 2001
+++ gnue/geas/src/methods/methods.c     Fri Sep 14 21:47:25 2001
@@ -19,7 +19,7 @@
   along with GEAS; if not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-  $Id: methods.c,v 1.12 2001/09/15 00:20:18 ntiffin Exp $
+  $Id: methods.c,v 1.13 2001/09/15 01:47:25 ntiffin Exp $
 */
 
 #include "config.h"
@@ -34,18 +34,8 @@
 #include "exceptions.h"
 
 #include "methods_python.h"
+#include "methods_glibmodule.h"
 
-/* base data structures and related private utility methods */
-typedef struct
-{
-  char         *classname;              /* full class name      */
-  char         *methodname;             /* name of method field */
-  char         *cid;
-  CORBA_Object  object;
-  void         *extra;                  /* misc */
-  void         *function;               /* glib */
-}
-provider_t;
 
 static provider_t *alloc_provider_data (const char *classname,
                                         const char *cid,
@@ -63,11 +53,12 @@
   gboolean status = FALSE;
 
 #if USE_PYTHON_METHODS  
-  status = python_initialise_method_handling (configuration config);
+  status = python_init_method_handling(configuration config);
 #endif
 
 #if USE_GLIBMODULE_METHODS
-  status = status || gmodule_initialise_method_handling(configuration config);
+  //status = status || glibmodule_initialise_method_handling (configuration 
config);
+  status = gmod_init_method_handling(configuration config);
 #endif
 
 #if ! USE_PYTHON_METHODS && ! USE_GLIBMODULE_METHODS
@@ -75,20 +66,18 @@
   message ("No business class methods will work.");
 #endif
 
-  return (status);
+  return status;
 }
 
 gboolean
 load_method_handlers (configuration config)
 {
-  /* can't load if we're not ready, and we can't be ready (see above :) */
   return (FALSE);
 }
 
 gboolean
 shutdown_method_handling (void)
 {
-  /* no code here */
   return (FALSE);
 }
 
@@ -98,7 +87,6 @@
                 const char *methodname, GEAS_Arguments * args,
                 CORBA_Environment * ev)
 {
-  /* hi, mom! */
   fatal_error ("No method code handling has been compiled.");
   return (NULL);
 }
Index: gnue/geas/src/methods/methods.h
diff -u gnue/geas/src/methods/methods.h:1.7 gnue/geas/src/methods/methods.h:1.8
--- gnue/geas/src/methods/methods.h:1.7 Fri Jun  8 18:42:42 2001
+++ gnue/geas/src/methods/methods.h     Fri Sep 14 21:47:25 2001
@@ -19,7 +19,7 @@
   along with GEAS; if not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-  $Id: methods.h,v 1.7 2001/06/08 22:42:42 reinhard Exp $
+  $Id: methods.h,v 1.8 2001/09/15 01:47:25 ntiffin Exp $
 */
 
 #ifndef METHODS_H
@@ -27,6 +27,18 @@
 
 #include "config/configuration.h"
 #include "geas-skeleton.h"
+
+/* base data structures and related private utility methods */
+typedef struct
+{
+  char         *classname;              /* full class name      */
+  char         *methodname;             /* name of method field */
+  char         *cid;
+  CORBA_Object  object;
+  void         *extra;                  /* misc */
+  void         *function;               /* glib */
+}
+provider_t;
 
 /* TODO: this section will need significant changes for dynamic loading of
  * modules, esp. during transactions */
Index: gnue/geas/src/methods/methods_glibmodule.c
diff -u gnue/geas/src/methods/methods_glibmodule.c:1.1 
gnue/geas/src/methods/methods_glibmodule.c:1.2
--- gnue/geas/src/methods/methods_glibmodule.c:1.1      Fri Sep 14 20:20:18 2001
+++ gnue/geas/src/methods/methods_glibmodule.c  Fri Sep 14 21:47:25 2001
@@ -19,13 +19,26 @@
   along with GEAS; if not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-  $Id: methods_glibmodule.c,v 1.1 2001/09/15 00:20:18 ntiffin Exp $
+  $Id: methods_glibmodule.c,v 1.2 2001/09/15 01:47:25 ntiffin Exp $
 */
 
-#ifndef USE_GLIBMODULE_METHODS
-#error "USE_GLIBMODULE_METHODS was not defined."
-#endif
+#include "config.h"
+#include <glib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <gmodule.h>
+#include <dirent.h>
+
+#include "geas-server.h"
+#include "classdata.h"
+#include "config/configuration.h"
+#include "methods.h"
+#include "exceptions.h"
+
 
+#include "methods_glibmodule.h"
+
 typedef char *(*METHODFUNC) (GEAS_DataObject obj, GEAS_Arguments * args,
                              GEAS_Connection server, CORBA_Environment * ev);
 
@@ -37,14 +50,10 @@
 #define ERR_NO_FUNCTIONS    (-2)
 #define ERR_MEMORY          (-3)
 
-#include <glib.h>
-#include <gmodule.h>
-#include <dirent.h>
-
 static GList *provider_list = NULL;
 
 gboolean
-initialise_method_handling (configuration config)
+gmod_init_method_handling(configuration config)
 {
   g_return_val_if_fail (config, FALSE);
 
@@ -54,7 +63,7 @@
 }
 
 gboolean
-load_method_handlers (configuration config)
+glibmodule_load_method_handlers (configuration config)
 {
   char *dirname;
   struct dirent;
@@ -175,13 +184,13 @@
 }
 
 gboolean
-shutdown_method_handling (void)
+glibmodule_shutdown_method_handling (void)
 {
   return (TRUE);
 }
 
 CORBA_char *
-execute_method (GEAS_object_reference *obj,
+glibmodule_execute_method (GEAS_object_reference *obj,
                 const char *methodname, GEAS_Arguments *args,
                 CORBA_Environment *ev)
 {
Index: gnue/geas/src/methods/methods_glibmodule.h
diff -u gnue/geas/src/methods/methods_glibmodule.h:1.14 
gnue/geas/src/methods/methods_glibmodule.h:1.15
--- gnue/geas/src/methods/methods_glibmodule.h:1.14     Fri Sep 14 20:21:22 2001
+++ gnue/geas/src/methods/methods_glibmodule.h  Fri Sep 14 21:47:25 2001
@@ -19,7 +19,7 @@
   along with GEAS; if not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-  $Id: methods_glibmodule.h,v 1.14 2001/09/15 00:21:22 ntiffin Exp $
+  $Id: methods_glibmodule.h,v 1.15 2001/09/15 01:47:25 ntiffin Exp $
 */
 
 #ifndef METHODS_GLIBMODULE_H
@@ -29,7 +29,7 @@
 /* ------------------------------------------------------------------------- *\
  * glibmodule_initialise_method_handling
 \* ------------------------------------------------------------------------- */
-gboolean glibmodule_initialise_method_handling(configuration config);
+gboolean gmod_init_method_handling(configuration config);
 
 
 /* ------------------------------------------------------------------------- *\
Index: gnue/geas/src/methods/methods_python.c
diff -u gnue/geas/src/methods/methods_python.c:1.1 
gnue/geas/src/methods/methods_python.c:1.2
--- gnue/geas/src/methods/methods_python.c:1.1  Fri Sep 14 20:20:18 2001
+++ gnue/geas/src/methods/methods_python.c      Fri Sep 14 21:47:25 2001
@@ -19,7 +19,7 @@
   along with GEAS; if not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-  $Id: methods_python.c,v 1.1 2001/09/15 00:20:18 ntiffin Exp $
+  $Id: methods_python.c,v 1.2 2001/09/15 01:47:25 ntiffin Exp $
 */
 
 /*
@@ -34,6 +34,21 @@
 #endif
 */
 
+#include "config.h"
+#include <glib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <gmodule.h>
+#include <dirent.h>
+#include <Python.h>
+
+#include "geas-server.h"
+#include "classdata.h"
+#include "config/configuration.h"
+#include "methods.h"
+#include "exceptions.h"
+
 #define DEFAULT_IDL_FILE   "geas.idl"
 #define DEFAULT_METHOD_DIR "../examples/businessobjects/methods"
 #define ORBIT_PYTHON_SO    "/usr/lib/python1.5/site-packages/CORBAmodule.so"
@@ -43,11 +58,6 @@
 #define ERR_NO_ORBIT_PYTHON (-2)
 #define ERR_NO_FUNCTIONS    (-3)
 #define ERR_MEMORY          (-4)
-
-#include <glib.h>
-#include <gmodule.h>
-#include <Python.h>
-#include <dirent.h>
 
 #include "methods_python.h"