[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas/src/methods methods.c methods_glibmod...
|
From: |
Neil Tiffin |
|
Subject: |
gnue/geas/src/methods methods.c methods_glibmod... |
|
Date: |
Sun, 23 Sep 2001 14:59:44 -0400 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Neil Tiffin <address@hidden> 01/09/23 14:59:43
Modified files:
geas/src/methods: methods.c methods_glibmodule.c
methods_glibmodule.h methods_python.c
Log message:
Clean up formatting.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.c.diff?cvsroot=OldCVS&tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_glibmodule.c.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_glibmodule.h.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_python.c.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: gnue/geas/src/methods/methods.c
diff -u gnue/geas/src/methods/methods.c:1.17
gnue/geas/src/methods/methods.c:1.18
--- gnue/geas/src/methods/methods.c:1.17 Sat Sep 15 20:37:46 2001
+++ gnue/geas/src/methods/methods.c Sun Sep 23 14:59:43 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.17 2001/09/16 00:37:46 ntiffin Exp $
+ $Id: methods.c,v 1.18 2001/09/23 18:59:43 ntiffin Exp $
*/
#include "config.h"
@@ -41,8 +41,8 @@
{
gboolean status = FALSE;
-#if USE_PYTHON_METHODS
- status = python_init_method_handling(config);
+#if USE_PYTHON_METHODS
+ status = python_init_method_handling (config);
#endif
#if USE_GLIBMODULE_METHODS
@@ -63,15 +63,15 @@
load_method_handlers (configuration config)
{
gboolean status = FALSE;
-
-#if USE_PYTHON_METHODS
+
+#if USE_PYTHON_METHODS
status = python_load_method_handlers (config);
#endif
#if USE_GLIBMODULE_METHODS
- status = status || glibmodule_load_method_handlers(config);
+ status = status || glibmodule_load_method_handlers (config);
#endif
-
+
return (status);
}
@@ -79,15 +79,15 @@
shutdown_method_handling (void)
{
gboolean status = FALSE;
-
-#if USE_PYTHON_METHODS
+
+#if USE_PYTHON_METHODS
status = python_shutdown_method_handling ();
#endif
#if USE_GLIBMODULE_METHODS
- status = status || glibmodule_shutdown_method_handling();
+ status = status || glibmodule_shutdown_method_handling ();
#endif
-
+
return (status);
}
@@ -97,7 +97,7 @@
const char *methodname, GEAS_Arguments * args,
CORBA_Environment * ev)
{
- CORBA_char * result = NULL;
+ CORBA_char *result = NULL;
#if USE_PYTHON_METHODS
result = python_execute_method (obj, methodname, args, ev);
Index: gnue/geas/src/methods/methods_glibmodule.c
diff -u gnue/geas/src/methods/methods_glibmodule.c:1.3
gnue/geas/src/methods/methods_glibmodule.c:1.4
--- gnue/geas/src/methods/methods_glibmodule.c:1.3 Sun Sep 16 14:42:23 2001
+++ gnue/geas/src/methods/methods_glibmodule.c Sun Sep 23 14:59:43 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.c,v 1.3 2001/09/16 18:42:23 ntiffin Exp $
+ $Id: methods_glibmodule.c,v 1.4 2001/09/23 18:59:43 ntiffin Exp $
*/
#include "config.h"
@@ -54,7 +54,7 @@
static GList *provider_list = NULL;
gboolean
-gmod_init_method_handling(configuration config)
+gmod_init_method_handling (configuration config)
{
g_return_val_if_fail (config, FALSE);
@@ -132,27 +132,27 @@
{
METHODFUNC *funcptr;
odl_field *f = (odl_field *) l3->data;
- char *funcname =
- g_strdup_printf ("%s_%s", mangled,
- odl_field_get_name (f));
+ char *funcname = g_strdup_printf ("%s_%s", mangled,
+ odl_field_get_name (f));
/* printf ("looking for %s.%s (%s)",
- odl_class_get_full_name (c), odl_field_get_name (f),
- funcname); */
+ odl_class_get_full_name (c), odl_field_get_name (f),
+ funcname); */
g_module_symbol (module, funcname, (gpointer) & funcptr);
/* if (funcptr)
- printf ("...found\n");
- else
- printf ("...not found\n"); */
+ printf ("...found\n");
+ else
+ printf ("...not found\n"); */
g_free (funcname);
/* store the pointer to this function */
if (funcptr)
{
- provider_t *p =
- alloc_provider_data (mangled, NULL,
- odl_field_get_name (f),
- (void *) storemodule);
+ provider_t *p = alloc_provider_data (mangled, NULL,
+ odl_field_get_name
+ (f),
+ (void *)
+ storemodule);
if (p)
{
provider_list = g_list_append (provider_list, p);
@@ -191,9 +191,9 @@
}
CORBA_char *
-glibmodule_execute_method (GEAS_object_reference *obj,
- const char *methodname, GEAS_Arguments *args,
- CORBA_Environment *ev)
+glibmodule_execute_method (GEAS_object_reference * obj,
+ const char *methodname, GEAS_Arguments * args,
+ CORBA_Environment * ev)
{
char *classname = obj->classname;
GList *l = provider_list;
@@ -270,7 +270,8 @@
/* ------------------------------------------------------------------------- *\
* glibmodule_initialise_method_handling
\* ------------------------------------------------------------------------- */
-gboolean gmod_init_method_handling(configuration config)
+gboolean
+gmod_init_method_handling (configuration config)
{
return FALSE;
}
@@ -279,7 +280,8 @@
/* ------------------------------------------------------------------------- *\
* glibmodule_load_method_handlers
\* ------------------------------------------------------------------------- */
-gboolean glibmodule_load_method_handlers (configuration config)
+gboolean
+glibmodule_load_method_handlers (configuration config)
{
return FALSE;
}
@@ -288,7 +290,8 @@
/* ------------------------------------------------------------------------- *\
* glibmodule_shutdown_method_handling
\* ------------------------------------------------------------------------- */
-gboolean glibmodule_shutdown_method_handling (void)
+gboolean
+glibmodule_shutdown_method_handling (void)
{
return FALSE;
}
@@ -297,9 +300,10 @@
/* ------------------------------------------------------------------------- *\
* glibmodule_execute_method
\* ------------------------------------------------------------------------- */
-CORBA_char * glibmodule_execute_method (GEAS_object_reference * obj,
- const char *methodname, GEAS_Arguments * args,
- CORBA_Environment * ev)
+CORBA_char *
+glibmodule_execute_method (GEAS_object_reference * obj,
+ const char *methodname, GEAS_Arguments * args,
+ CORBA_Environment * ev)
{
return NULL;
}
Index: gnue/geas/src/methods/methods_glibmodule.h
diff -u gnue/geas/src/methods/methods_glibmodule.h:1.16
gnue/geas/src/methods/methods_glibmodule.h:1.17
--- gnue/geas/src/methods/methods_glibmodule.h:1.16 Sat Sep 15 08:57:31 2001
+++ gnue/geas/src/methods/methods_glibmodule.h Sun Sep 23 14:59:43 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.16 2001/09/15 12:57:31 ntiffin Exp $
+ $Id: methods_glibmodule.h,v 1.17 2001/09/23 18:59:43 ntiffin Exp $
*/
#ifndef METHODS_GLIBMODULE_H
@@ -29,7 +29,7 @@
/* ------------------------------------------------------------------------- *\
* glibmodule_initialise_method_handling
\* ------------------------------------------------------------------------- */
-gboolean gmod_init_method_handling(configuration config);
+gboolean gmod_init_method_handling (configuration config);
/* ------------------------------------------------------------------------- *\
@@ -47,8 +47,9 @@
/* ------------------------------------------------------------------------- *\
* glibmodule_execute_method
\* ------------------------------------------------------------------------- */
-CORBA_char * glibmodule_execute_method (GEAS_object_reference * obj,
- const char *methodname, GEAS_Arguments * args,
- CORBA_Environment * ev);
+CORBA_char *glibmodule_execute_method (GEAS_object_reference * obj,
+ const char *methodname,
+ GEAS_Arguments * args,
+ CORBA_Environment * ev);
#endif
Index: gnue/geas/src/methods/methods_python.c
diff -u gnue/geas/src/methods/methods_python.c:1.13
gnue/geas/src/methods/methods_python.c:1.14
--- gnue/geas/src/methods/methods_python.c:1.13 Sun Sep 23 10:18:11 2001
+++ gnue/geas/src/methods/methods_python.c Sun Sep 23 14:59:43 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.13 2001/09/23 14:18:11 ntiffin Exp $
+ $Id: methods_python.c,v 1.14 2001/09/23 18:59:43 ntiffin Exp $
*/
/*
@@ -126,8 +126,8 @@
* load_method_handlers(). These are normally called by the geas server.
\* ========================================================================= */
-CORBA_char * /* TODO should be a structure that represents a type */
-python_execute_function( const char *function_name, GEAS_Arguments *args)
+CORBA_char * /* TODO should be a structure that represents
a type */
+python_execute_function (const char *function_name, GEAS_Arguments * args)
{
/*
g_return_val_if_fail (function_name, NULL);
@@ -256,7 +256,7 @@
// char *name;
odl_field *f;
FILE *fp;
- GList *l;
+ GList *l;
GList *l2;
odl_class *c;
char *full_classname;
@@ -281,7 +281,7 @@
fp = fopen (filename_list->data, "r");
if (!fp)
{
- errormsg ("Could not open file '%s'", filename_list->data);
+ errormsg ("Could not open file '%s'", filename_list->data);
}
else
{
@@ -292,9 +292,9 @@
g_free (filename_list->data);
filename_list = g_list_next (filename_list);
}
- g_list_free( (GList *) fl );
+ g_list_free ((GList *) fl);
/* done loading, now register */
- message("Now registering methods from gcds.");
+ message ("Now registering methods from gcds.");
lst = l = odl_tree_list_classes (all_classes);
while (l)
{
@@ -320,7 +320,7 @@
full_classname, odl_field_get_name (f));
g_strdown (buf);
message ("Registering method: %s_%s, from file: %s", full_classname,
- odl_field_get_name (f), odl_class_get_gcd_filename(c) );
+ odl_field_get_name (f), odl_class_get_gcd_filename (c));
PyRun_SimpleString (buf);
g_free (buf);
current_provider = NULL;
@@ -389,11 +389,11 @@
while (list)
{
/*
- g_message ("classname: %s = %s", ((provider_t *) list->data)->classname,
- obj->classname);
- g_message ("fieldname: %s = %s",
- ((provider_t *) list->data)->methodname, methodname);
- */
+ g_message ("classname: %s = %s", ((provider_t *)
list->data)->classname,
+ obj->classname);
+ g_message ("fieldname: %s = %s",
+ ((provider_t *) list->data)->methodname, methodname);
+ */
if (!g_strcasecmp
(((provider_t *) list->data)->classname,
g_strdelimit (obj->classname, ":", '_'))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas/src/methods methods.c methods_glibmod...,
Neil Tiffin <=