gnue/geas/src geas-server.c geas-skeleton.c ser...

[Daniel E. Baumann]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Daniel E. Baumann <address@hidden>      01/06/09 00:18:15

Modified files:
        geas/src       : geas-server.c geas-skeleton.c servantlocator.h 

Log message:
        Fix more warnings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.c.diff?cvsroot=OldCVS&tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-skeleton.c.diff?cvsroot=OldCVS&tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/servantlocator.h.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.98 gnue/geas/src/geas-server.c:1.99
--- gnue/geas/src/geas-server.c:1.98    Fri Jun  8 23:25:26 2001
+++ gnue/geas/src/geas-server.c Sat Jun  9 00:18:15 2001
@@ -19,7 +19,7 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
   
-  $Id: geas-server.c,v 1.98 2001/06/09 06:25:26 baumannd Exp $
+  $Id: geas-server.c,v 1.99 2001/06/09 07:18:15 baumannd Exp $
  
 */
 
@@ -408,7 +408,7 @@
   fp = fopen (filename, "w");
   if (fp)
     {
-      fprintf (fp, "%lu", getpid ());
+      fprintf (fp, "%lu", (long)getpid ());
       fclose (fp);
       fp = NULL;
     }
@@ -577,7 +577,7 @@
                    unsigned int line, char *msg, ...)
 {
   va_list a;
-  unsigned long int dmtype;
+  unsigned long int dmtype = 0;
 
   /* write to log file */
   if (g_strcasecmp (type, "error"))
@@ -674,7 +674,7 @@
 {
   int c;
   /* int digit_optind = 0; */
-  int i;
+  unsigned int i;
   int fatal = 0;                /* set fatal > 0 to quit. if fatal > 1 print
 
                                    usage first */
@@ -951,7 +951,7 @@
       fprintf (stdout, "Verbose             : %s\n",
                (settings.verbose == CORBA_TRUE) ? "On" : "Off");
       fprintf (stdout, "Max cache size      : %d\n",
-               settings.cache_maximum_size);
+               (int)settings.cache_maximum_size);
       fprintf (stdout, "Log geas classes    : %s\n",
                (settings.loggeasclasses ? "Yes" : "No"));
       fprintf (stdout, "\n");
@@ -1572,6 +1572,7 @@
   return (NULL);
 }
 
+/*
 static struct ColumnAlias *
 find_alias_column (GList * cols, const char *name)
 {
@@ -1584,6 +1585,7 @@
     }
   return (NULL);
 }
+*/
 
 static void
 loadTableAliases (const char *filename)
@@ -1598,7 +1600,7 @@
   char tablename[1024];
   char pkey[1024];
   char column[1024];
-  gboolean modify;
+  gboolean modify = FALSE;
 
   printf ("Loading aliases from file '%s'\n", filename);
 
Index: gnue/geas/src/geas-skeleton.c
diff -u gnue/geas/src/geas-skeleton.c:1.59 gnue/geas/src/geas-skeleton.c:1.60
--- gnue/geas/src/geas-skeleton.c:1.59  Thu Jun  7 16:37:05 2001
+++ gnue/geas/src/geas-skeleton.c       Sat Jun  9 00:18:15 2001
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
    
-   $Id: geas-skeleton.c,v 1.59 2001/06/07 23:37:05 ntiffin Exp $
+   $Id: geas-skeleton.c,v 1.60 2001/06/09 07:18:15 baumannd Exp $
  
 */
 
@@ -465,7 +465,7 @@
 impl_GEAS_Query_Query__get_logic (impl_POA_GEAS_Query_Query * servant,
                                   CORBA_Environment * ev)
 {
-  GEAS_Query_logictype retval;
+  GEAS_Query_logictype retval = GEAS_Query_UNKNOWN;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -502,7 +502,7 @@
 impl_GEAS_Query_Query__get_classname (impl_POA_GEAS_Query_Query * servant,
                                       CORBA_Environment * ev)
 {
-  CORBA_char *retval;
+  CORBA_char *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1337,7 +1337,7 @@
 impl_GEAS_DataObject__get_objectID (impl_POA_GEAS_DataObject * servant,
                                     CORBA_Environment * ev)
 {
-  GEAS_ObjectReference retval;
+  GEAS_ObjectReference retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1356,7 +1356,7 @@
 impl_GEAS_DataObject_ofclass (impl_POA_GEAS_DataObject * servant,
                               CORBA_char * classname, CORBA_Environment * ev)
 {
-  CORBA_boolean retval;
+  CORBA_boolean retval = FALSE;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1375,7 +1375,7 @@
 impl_GEAS_DataObject__get_classname (impl_POA_GEAS_DataObject * servant,
                                      CORBA_Environment * ev)
 {
-  CORBA_char *retval;
+  CORBA_char *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1394,7 +1394,7 @@
 impl_GEAS_DataObject__get_classes (impl_POA_GEAS_DataObject * servant,
                                    CORBA_Environment * ev)
 {
-  GEAS_classnames *retval;
+  GEAS_classnames *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1413,7 +1413,7 @@
 impl_GEAS_DataObject__get_allfields (impl_POA_GEAS_DataObject * servant,
                                      CORBA_Environment * ev)
 {
-  GEAS_fieldlist *retval;
+  GEAS_fieldlist *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1433,7 +1433,7 @@
                                             servant, CORBA_char * fieldname,
                                             CORBA_Environment * ev)
 {
-  GEAS_LookupOptions *retval;
+  GEAS_LookupOptions *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1470,7 +1470,7 @@
 impl_GEAS_DataObject_getField (impl_POA_GEAS_DataObject * servant,
                                CORBA_char * fieldname, CORBA_Environment * ev)
 {
-  CORBA_char *retval;
+  CORBA_char *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1514,7 +1514,7 @@
                                    CORBA_char * fieldname,
                                    CORBA_Environment * ev)
 {
-  GEAS_DataObject retval;
+  GEAS_DataObject retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1532,7 +1532,7 @@
 impl_GEAS_DataObject_getList (impl_POA_GEAS_DataObject * servant,
                               CORBA_char * fieldname, CORBA_Environment * ev)
 {
-  GEAS_ObjectList retval;
+  GEAS_ObjectList retval = NULL;
   GEAS_object_reference *id;
 
   allow_oid_refill = FALSE;
@@ -1628,7 +1628,7 @@
                                  GEAS_Arguments * args,
                                  CORBA_Environment * ev)
 {
-  CORBA_char *retval;
+  CORBA_char *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1650,7 +1650,7 @@
 impl_GEAS_ObjectList__get_length (impl_POA_GEAS_ObjectList * servant,
                                   CORBA_Environment * ev)
 {
-  CORBA_unsigned_long retval;
+  CORBA_unsigned_long retval = 0;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1671,7 +1671,7 @@
 impl_GEAS_ObjectList__get_objects (impl_POA_GEAS_ObjectList * servant,
                                    CORBA_Environment * ev)
 {
-  GEAS_objectslist *retval;
+  GEAS_objectslist *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1693,7 +1693,7 @@
 impl_GEAS_ObjectList__get_classname (impl_POA_GEAS_ObjectList * servant,
                                      CORBA_Environment * ev)
 {
-  CORBA_char *retval;
+  CORBA_char *retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1713,7 +1713,7 @@
                                CORBA_unsigned_long index,
                                CORBA_Environment * ev)
 {
-  GEAS_DataObject retval;
+  GEAS_DataObject retval = NULL;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1791,7 +1791,7 @@
                                   CORBA_char * compare,
                                   CORBA_char * value, CORBA_Environment * ev)
 {
-  CORBA_unsigned_long retval;
+  CORBA_unsigned_long retval = 0;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1812,7 +1812,7 @@
                                   CORBA_char * compare,
                                   CORBA_char * value, CORBA_Environment * ev)
 {
-  CORBA_unsigned_long retval;
+  CORBA_unsigned_long retval = 0;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1846,7 +1846,7 @@
 impl_GEAS_ObjectList_applyFilter (impl_POA_GEAS_ObjectList * servant,
                                   CORBA_Environment * ev)
 {
-  CORBA_unsigned_long retval;
+  CORBA_unsigned_long retval = 0;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -1865,7 +1865,7 @@
 impl_GEAS_ObjectList__get_delayFilter (impl_POA_GEAS_ObjectList * servant,
                                        CORBA_Environment * ev)
 {
-  CORBA_boolean retval;
+  CORBA_boolean retval = FALSE;
   GEAS_object_reference *id;
 
   trace_functioncall ();
@@ -2068,7 +2068,7 @@
   /* prevent duplicates */
   if (count != 0)
     {
-      return;
+      return 0;
     }
   count = 1;
 
@@ -2301,6 +2301,8 @@
      fatal_error( "Error setting Admin servant manager: %s" ,
      CORBA_exception_id(&ev) ); } */
   CORBA_exception_free (&ev);
+
+  return 1;
 }
 
 #else
Index: gnue/geas/src/servantlocator.h
diff -u gnue/geas/src/servantlocator.h:1.13 gnue/geas/src/servantlocator.h:1.14
--- gnue/geas/src/servantlocator.h:1.13 Fri May 25 13:04:54 2001
+++ gnue/geas/src/servantlocator.h      Sat Jun  9 00:18:15 2001
@@ -36,6 +36,9 @@
 static GEAS_object_reference *
   get_current_object_id( PortableServer_Servant servant , PortableServer_POA 
poa , CORBA_Environment *ev );
 
+void create_fake_servants( PortableServer_POA root_poa , CORBA_Environment *ev 
);
+void free_fake_servants(void );
+
 /* locator functions */
 static PortableServer_Servant preinvoke_query  (PortableServer_ObjectId 
*oid,PortableServer_POA adapter,   CORBA_Identifier 
op_name,PortableServer_ServantLocator_Cookie *cookie)
 {
@@ -307,7 +310,7 @@
    poa_servantmanager_constraint = create_locator( root_poa , &constraint_vepv 
, ev );
 }
 
-void free_fake_servants( )
+void free_fake_servants(void )
 {
    /* TODO: */