gnue/geas/src connection.c event_log_code.h que...

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/06/12 12:12:30

Modified files:
        geas/src       : connection.c event_log_code.h query.c schema.c 
                         servantlocator.h 

Log message:
        Fixed compiler warnings

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/connection.c.diff?cvsroot=OldCVS&tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/event_log_code.h.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/query.c.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/schema.c.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/servantlocator.h.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gnue/geas/src/connection.c
diff -u gnue/geas/src/connection.c:1.61 gnue/geas/src/connection.c:1.62
--- gnue/geas/src/connection.c:1.61     Sat Jun  9 16:06:40 2001
+++ gnue/geas/src/connection.c  Tue Jun 12 12:12:30 2001
@@ -1,6 +1,5 @@
-
 /*
-   connections.c - 
+   connection.c - 
    
    Part of GNU Enterprise Application Server (GEAS)
  
@@ -20,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: connection.c,v 1.61 2001/06/09 23:06:40 ntiffin Exp $
+   $Id: connection.c,v 1.62 2001/06/12 19:12:30 reinhard Exp $
  
 */
 
@@ -246,11 +245,6 @@
   char *keystr = NULL;
   ObjectKey key = NULL;
   odl_class *cl;
-  /* GList *fields; */
-  /* GList *fl; */
-  /* ObjectData *ob; */
-  GList *parents;
-  /* GList *l; */
 
   cl = odl_find_class (all_classes, classname, NULL);
   if (!cl)
@@ -262,10 +256,6 @@
   key = create_new_object_key ();
   if (!key)
     {
-      if (parents)
-        {
-          odl_namelist_free (parents);
-        }
       make_ServerError_exception (ev, "Error creating new key");
       return (CORBA_OBJECT_NIL);
     }
@@ -273,10 +263,6 @@
   keystr = (char *) object_key_as_string (key);
   if (!keystr)
     {
-      if (parents)
-        {
-          odl_namelist_free (parents);
-        }
       free_object_key (key);
       make_ServerError_exception (ev, "Error creating new key");
       return (CORBA_OBJECT_NIL);
Index: gnue/geas/src/event_log_code.h
diff -u gnue/geas/src/event_log_code.h:1.4 gnue/geas/src/event_log_code.h:1.5
--- gnue/geas/src/event_log_code.h:1.4  Sat Jun  9 16:06:40 2001
+++ gnue/geas/src/event_log_code.h      Tue Jun 12 12:12:30 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: event_log_code.h,v 1.4 2001/06/09 23:06:40 ntiffin Exp $
+   $Id: event_log_code.h,v 1.5 2001/06/12 19:12:30 reinhard Exp $
 */
 
 #include <time.h>
@@ -75,7 +75,7 @@
 
   t = time (NULL);
   tm = localtime (&t);
-  strftime (buf, 1020, "%G-%m-%y %H:%M:%S", tm);
+  strftime (buf, 1020, "%Y-%m-%d %H:%M:%S", tm);
   sprintf (x, ".%d", y);
   strcat (buf, x);
   if (last < t)
@@ -243,7 +243,7 @@
 Connection_logEdit (const char *classname, const char *oid,
                     const char *fieldname, GEAS_object_reference * id)
 {
-  LoggableEvent *evt;
+  LoggableEvent *evt = NULL;
   EventLog *e;
   GList *l = event_logs;
 
@@ -294,7 +294,7 @@
 Connection_logDelete (const char *classname, const char *oid,
                       GEAS_object_reference * id)
 {
-  LoggableEvent *evt;
+  LoggableEvent *evt = NULL;
   EventLog *e;
   GList *l = event_logs;
 
Index: gnue/geas/src/query.c
diff -u gnue/geas/src/query.c:1.10 gnue/geas/src/query.c:1.11
--- gnue/geas/src/query.c:1.10  Thu Jun  7 07:41:43 2001
+++ gnue/geas/src/query.c       Tue Jun 12 12:12:30 2001
@@ -1,4 +1,3 @@
-
 /*
    query.c -
    
@@ -20,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: query.c,v 1.10 2001/06/07 14:41:43 ntiffin Exp $
+   $Id: query.c,v 1.11 2001/06/12 19:12:30 reinhard Exp $
  
 */
 
@@ -45,7 +44,7 @@
 Constraint__get_logic (GEAS_object_reference * id, CORBA_Environment * ev)
 {
   char *tmp;
-  GEAS_Query_logictype retval;
+  GEAS_Query_logictype retval = GEAS_Query_UNKNOWN;
   GEAS_DataObject q;
 
   q = GEAS_Connection_loadSingleObject (id->server, "geas::searchcriteria",
@@ -105,7 +104,7 @@
                      CORBA_Environment * ev)
 {
   GEAS_DataObject f;
-  char *buf;
+  char *buf = NULL;
 
   /* create storage object */
   f = GEAS_Connection_newObject (id->server, "geas::searchfield", ev);
@@ -290,7 +289,7 @@
 CORBA_char *
 Query__get_orderby (GEAS_object_reference * id, CORBA_Environment * ev)
 {
-  CORBA_char *retval;
+  CORBA_char *retval = NULL;
   GEAS_DataObject q;
 
   q = GEAS_Connection_loadSingleObject (id->server, "geas::searchcriteria",
@@ -333,7 +332,7 @@
 Query__get_reverse (GEAS_object_reference * id, CORBA_Environment * ev)
 {
   char *tmp;
-  CORBA_boolean retval;
+  CORBA_boolean retval = CORBA_FALSE;
   GEAS_DataObject q;
 
   q = GEAS_Connection_loadSingleObject (id->server, "geas::searchcriteria",
@@ -408,7 +407,7 @@
 CORBA_char *
 Query__get_classname (GEAS_object_reference * id, CORBA_Environment * ev)
 {
-  CORBA_char *retval;
+  CORBA_char *retval = NULL;
   GEAS_DataObject q;
 
   q = GEAS_Connection_loadSingleObject (id->server, "geas::searchcriteria",
Index: gnue/geas/src/schema.c
diff -u gnue/geas/src/schema.c:1.13 gnue/geas/src/schema.c:1.14
--- gnue/geas/src/schema.c:1.13 Sat Jun  9 08:27:02 2001
+++ gnue/geas/src/schema.c      Tue Jun 12 12:12:30 2001
@@ -1,4 +1,3 @@
-
 /*
    schema.c -
    
@@ -20,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: schema.c,v 1.13 2001/06/09 15:27:02 ntiffin Exp $
+   $Id: schema.c,v 1.14 2001/06/12 19:12:30 reinhard Exp $
  
 */
 
@@ -76,7 +75,7 @@
         {
           if (strncmp (l->data, "root::", 6) == 0)
             {
-              retval->_buffer[i] = CORBA_string_dup (&l->data[6]);
+              retval->_buffer[i] = CORBA_string_dup (&((char *)(l->data))[6]);
             }
           else
             {
Index: gnue/geas/src/servantlocator.h
diff -u gnue/geas/src/servantlocator.h:1.16 gnue/geas/src/servantlocator.h:1.17
--- gnue/geas/src/servantlocator.h:1.16 Sun Jun 10 05:56:12 2001
+++ gnue/geas/src/servantlocator.h      Tue Jun 12 12:12:30 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: servantlocator.h,v 1.16 2001/06/10 12:56:12 ntiffin Exp $
+   $Id: servantlocator.h,v 1.17 2001/06/12 19:12:30 reinhard Exp $
 
 */
 
@@ -35,12 +35,6 @@
 extern POA_GEAS_Admin poa_geas_admin_servant;
 extern POA_GEAS_Query_Constraint poa_geas_query_constraint_servant;
 extern POA_GEAS_Query_Query poa_geas_query_query_servant;
-
-/* prototype: get GEAS_object_reference - internal ID used by this object */
-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);