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

[Daniel E. Baumann]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Daniel E. Baumann <address@hidden>      01/06/08 14:26:45

Modified files:
        geas/src/methods: methods.c methods.h methods_glibmodule.h 
                          methods_oaf.h methods_unstable.h 

Log message:
        Fix warnings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.c.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.h.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_glibmodule.h.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_oaf.h.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_unstable.h.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/geas/src/methods/methods.c
diff -u gnue/geas/src/methods/methods.c:1.8 gnue/geas/src/methods/methods.c:1.9
--- gnue/geas/src/methods/methods.c:1.8 Fri Jun  8 11:53:53 2001
+++ gnue/geas/src/methods/methods.c     Fri Jun  8 14:26:45 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.8 2001/06/08 18:53:53 baumannd Exp $
+  $Id: methods.c,v 1.9 2001/06/08 21:26:45 baumannd Exp $
 */
 
 #include "config.h"
@@ -76,13 +76,13 @@
 }
 
 gboolean
-load_method_handlers ()
+load_method_handlers (configuration config)
 {
   /* can't load if we're not ready, and we can't be ready (see above :) */
 }
 
 gboolean
-shutdown_method_handling ()
+shutdown_method_handling (void)
 {
   /* no code here */
 }
@@ -143,6 +143,7 @@
         }
       return (p);
     }
+  return (NULL);
 }
 
 static void
Index: gnue/geas/src/methods/methods.h
diff -u gnue/geas/src/methods/methods.h:1.5 gnue/geas/src/methods/methods.h:1.6
--- gnue/geas/src/methods/methods.h:1.5 Fri Jun  8 12:59:21 2001
+++ gnue/geas/src/methods/methods.h     Fri Jun  8 14:26:45 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.5 2001/06/08 19:59:21 baumannd Exp $
+  $Id: methods.h,v 1.6 2001/06/08 21:26:45 baumannd Exp $
 */
 
 #ifndef METHODS_H
@@ -31,8 +31,8 @@
  * modules, esp. during transactions */
 
 gboolean initialise_method_handling (configuration config);
-gboolean load_method_handlers ();
-gboolean shutdown_method_handling ();   /* TODO */
+gboolean load_method_handlers (configuration config);
+gboolean shutdown_method_handling (void);   /* TODO */
 
 /* assumes everything has been validated already */
 CORBA_char *execute_method (GEAS_object_reference * obj,
Index: gnue/geas/src/methods/methods_glibmodule.h
diff -u gnue/geas/src/methods/methods_glibmodule.h:1.8 
gnue/geas/src/methods/methods_glibmodule.h:1.9
--- gnue/geas/src/methods/methods_glibmodule.h:1.8      Fri Jun  8 11:38:05 2001
+++ gnue/geas/src/methods/methods_glibmodule.h  Fri Jun  8 14:26:45 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.8 2001/06/08 18:38:05 baumannd Exp $
+  $Id: methods_glibmodule.h,v 1.9 2001/06/08 21:26:45 baumannd Exp $
 */
 
 #ifndef USE_GLIBMODULE_METHODS
@@ -55,12 +55,8 @@
 load_method_handlers (configuration config)
 {
   char *dirname;
-  char *name;
-  odl_field *f;
-  struct dirent *entry;
-  DIR *dir;
-  FILE *fp;
-  GList *l, *l2, *l3;
+  struct dirent;
+  GList *l, *l3;
   odl_class *c;
   odl_namelist *classlist;
   char abspath[PATH_MAX];
@@ -100,7 +96,7 @@
           if (realpath (dirname, abspath) == NULL)
             {
               /* directory not found */
-              return;
+              return (FALSE);
             }
           strcat (abspath, "/.libs");
           path = g_module_build_path (abspath, mangled);
@@ -168,11 +164,14 @@
       l = g_list_next (l);
     }
   odl_namelist_free (l);
+  
+  return (TRUE);
 }
 
 gboolean
-shutdown_method_handling ()
+shutdown_method_handling (void)
 {
+  return (TRUE);
 }
 
 CORBA_char *
Index: gnue/geas/src/methods/methods_oaf.h
diff -u gnue/geas/src/methods/methods_oaf.h:1.3 
gnue/geas/src/methods/methods_oaf.h:1.4
--- gnue/geas/src/methods/methods_oaf.h:1.3     Fri Jun  8 12:59:21 2001
+++ gnue/geas/src/methods/methods_oaf.h Fri Jun  8 14:26:45 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_oaf.h,v 1.3 2001/06/08 19:59:21 baumannd Exp $
+  $Id: methods_oaf.h,v 1.4 2001/06/08 21:26:45 baumannd Exp $
 */
 
 #ifndef USE_OAF
@@ -45,7 +45,7 @@
 static GList *provider_list = NULL;
 
 gboolean
-initialise_method_handling ()
+initialise_method_handling (void)
 {
   GList *cl, *l, *fields, *fl;
   classdata *c;
@@ -168,7 +168,7 @@
 }
 
 gboolean
-shutdown_method_handling ()
+shutdown_method_handling (void)
 {
 }
 
Index: gnue/geas/src/methods/methods_unstable.h
diff -u gnue/geas/src/methods/methods_unstable.h:1.6 
gnue/geas/src/methods/methods_unstable.h:1.7
--- gnue/geas/src/methods/methods_unstable.h:1.6        Fri Jun  8 12:59:21 2001
+++ gnue/geas/src/methods/methods_unstable.h    Fri Jun  8 14:26:45 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_unstable.h,v 1.6 2001/06/08 19:59:21 baumannd Exp $
+  $Id: methods_unstable.h,v 1.7 2001/06/08 21:26:45 baumannd Exp $
 */
 
 /*
@@ -282,7 +282,7 @@
 }
 
 gboolean
-shutdown_method_handling ()
+shutdown_method_handling (void)
 {
 }