gnue/geas/src geas-internal-classes.h geas-serv...

[Neil Tiffin]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/06/01 17:24:34

Modified files:
        geas/src       : geas-internal-classes.h geas-server.c 
                         geas-skeleton.h 
        geas/src/objectstore: objectstore.c 
        geas/src/oql   : oql.c 

Log message:
        Clean up compiler warnings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-internal-classes.h.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.c.diff?cvsroot=OldCVS&tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-skeleton.h.diff?cvsroot=OldCVS&tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/objectstore.c.diff?cvsroot=OldCVS&tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/oql.c.diff?cvsroot=OldCVS&tr1=1.54&tr2=1.55&r1=text&r2=text

Patches:
Index: gnue/geas/src/geas-internal-classes.h
diff -u gnue/geas/src/geas-internal-classes.h:1.15 
gnue/geas/src/geas-internal-classes.h:1.16
--- gnue/geas/src/geas-internal-classes.h:1.15  Mon May 14 14:57:57 2001
+++ gnue/geas/src/geas-internal-classes.h       Fri Jun  1 17:24:33 2001
@@ -52,7 +52,7 @@
 {
    odl_class *c;
    odl_field *f;
-   odl_index *i;
+   /* odl_index *i; */
    GList *body = NULL;
    GList *fields = NULL;
 
@@ -114,7 +114,7 @@
    odl_class *c;
    odl_field *f;
    GList *body = NULL;
-   GList *fields = NULL;
+   /* GList *fields = NULL; */
 
    /* ************************************ */
    /* make class GEAS::transaction */
@@ -252,7 +252,7 @@
    odl_class *c;
    odl_field *f;
    GList *body = NULL;
-   GList *fields = NULL;
+   /* GList *fields = NULL; */
 
    /* ************************************ */
    /* make class GEAS::searchcriteria */
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.91 gnue/geas/src/geas-server.c:1.92
--- gnue/geas/src/geas-server.c:1.91    Fri Jun  1 08:32:39 2001
+++ gnue/geas/src/geas-server.c Fri Jun  1 17:24:33 2001
@@ -23,7 +23,6 @@
  *  \brief Main function, and several utility functions
  */
 
-#include "config.h"
 #include <glib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -33,6 +32,7 @@
 #include <getopt.h>
 #endif
 
+#include <ctype.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
@@ -40,6 +40,7 @@
 
 #include <errno.h>
 
+#include "config.h"
 #include "geas.h"
 #include "geas-server.h"
 #include "globals.h"
@@ -424,6 +425,7 @@
   /* TODO: really need to put cleanup code here */
 
   message ("Server has been shut down.");
+  return 0;
 }
 
 /** \brief Used for internal operations only
@@ -649,7 +651,7 @@
 readOptions (int argc, char **argv)
 {
   int c;
-  int digit_optind = 0;
+  /* int digit_optind = 0; */
   int i;
   int fatal = 0;                /* set fatal > 0 to quit. if fatal > 1 print
 
@@ -683,8 +685,8 @@
   /* command line args override config file */
   while (1)
     {
-      int this_option_optind = optind ? optind : 1;
-      int option_index = 0;
+      /* int this_option_optind = optind ? optind : 1; */
+      /* int option_index = 0; */
 
 #ifdef USE_GNU_GETOPT
       c =
@@ -1165,6 +1167,7 @@
   configuration c;
   FILE *fp;
 
+  printf( "Trying to open config file '%s'\n" , filename );
   fp = fopen (filename, "r");
   if (fp != NULL)
     {
@@ -1175,7 +1178,7 @@
     {
       /* nope, so try a final fallback */
       filename = "geas.conf";
-      /* printf( "nope, so trying config file '%s'\n" , filename ); */
+      printf( "nope, so trying config file '%s'\n" , filename );
     }
 
   debug_output (DEBUGLEVEL_2, "Loading configuration from: %s", filename);
Index: gnue/geas/src/geas-skeleton.h
diff -u gnue/geas/src/geas-skeleton.h:1.24 gnue/geas/src/geas-skeleton.h:1.25
--- gnue/geas/src/geas-skeleton.h:1.24  Mon May 14 14:57:57 2001
+++ gnue/geas/src/geas-skeleton.h       Fri Jun  1 17:24:33 2001
@@ -137,4 +137,7 @@
 
 void refill_oid_buffer( int max );
 
+GEAS_ConnectionFactory
+impl_GEAS_ConnectionFactory__create(PortableServer_POA poa,
+                                    CORBA_Environment * ev);
 #endif /* SKELETON_H */
Index: gnue/geas/src/objectstore/objectstore.c
diff -u gnue/geas/src/objectstore/objectstore.c:1.59 
gnue/geas/src/objectstore/objectstore.c:1.60
--- gnue/geas/src/objectstore/objectstore.c:1.59        Fri May 25 16:46:22 2001
+++ gnue/geas/src/objectstore/objectstore.c     Fri Jun  1 17:24:34 2001
@@ -19,13 +19,14 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: objectstore.c,v 1.59 2001/05/25 23:46:22 reinhard Exp $
+   $Id: objectstore.c,v 1.60 2001/06/02 00:24:34 ntiffin Exp $
 */
 
 #include "config.h"
 #include "objectstore.h"
 #include <stdio.h>
 #include <limits.h>
+#include <string.h>
 #include "geas-server.h"
 #include "classdata.h"
 #include "datamonitor/datamonitor.h"
Index: gnue/geas/src/oql/oql.c
diff -u gnue/geas/src/oql/oql.c:1.54 gnue/geas/src/oql/oql.c:1.55
--- gnue/geas/src/oql/oql.c:1.54        Tue May 29 07:11:54 2001
+++ gnue/geas/src/oql/oql.c     Fri Jun  1 17:24:34 2001
@@ -1,6 +1,8 @@
 
 /*
-   geas - GNU Enterprise Application Server
+   oql.c - 
+
+   Part of GNU Enterprise Application Server (GEAS)
  
    Copyright (C) 2001 Free Software Foundation
  
@@ -18,8 +20,13 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  
+   $Id: oql.c,v 1.55 2001/06/02 00:24:34 ntiffin Exp $
+   
 */
 
+#include <string.h>
+#include <ctype.h>
+
 #include "config.h"
 #include "oql.h"
 #include "geas-server.h"
@@ -39,6 +46,7 @@
 get_last_oql_error()
    {
    fatal_error("This function should not be called");
+   return NULL;
    }
 
 static void oql_add_conditions_to_sql(_QueryData * q, DBType db, GString * 
buf);
@@ -245,6 +253,24 @@
             quoted = oql_quote_value(temp, db);
             g_free(temp);
             break;
+         case q_notequals:
+            /* TODO */
+            break;
+         case q_notlessthan:
+            /* TODO */
+            break;
+         case q_notgreaterthan:
+            /* TODO */
+            break;
+         case q_notcontains:
+            /* TODO */
+            break;
+         case q_notstartswith:
+            /* TODO */
+            break;
+         case q_notendswith:
+            /* TODO */
+            break;
             }
 
          switch (db)
@@ -571,7 +597,7 @@
 oql_make_delete(_QueryData * q, DBType db)
    {
    GString *buf;
-   GList *tmp;
+   /* GList *tmp; */
    char *loadclass = NULL;
    char *quoted, *classname, *key;
 
@@ -1002,11 +1028,12 @@
 oql_load_object_by_key(configuration config, const char *classname, const char 
*key)
    {
    GList *l;
-   GList *tmp, *parents;
+   /* GList *tmp; */
+   GList *parents;
    _QueryData *q = NULL;
    _QueryCondition *condition;
    odl_class *c;
-   GString *buf;
+   /* GString *buf; */
    GList *fields;
 
    /* trace_functioncall(); */
@@ -1118,11 +1145,12 @@
 oql_load_object_field_by_key(configuration config, const char *classname, 
const char *field, const char *key)
    {
    GList *l;
-   GList *tmp, *parents;
+   /* GList *tmp; */
+   GList *parents;
    _QueryData *q = NULL;
    _QueryCondition *condition;
    odl_class *c;
-   GString *buf;
+   /* GString *buf; */
 
    /* trace_functioncall(); */
    q = create_query_data(NULL);
@@ -1169,7 +1197,7 @@
    GList *l, *tmp, *parents;
    _QueryData *q = NULL;
    odl_class *c;
-   int nnn = 0;
+   /* int nnn = 0; */
 
    /* trace_functioncall(); */
    q = create_query_data(NULL);
@@ -1244,6 +1272,7 @@
    {
    /* trace_functioncall(); */
    fatal_error("OQL text queries not yet supported.");
+   return NULL;
    }
 
 /* search for objects that have a particular value in a particular field */
@@ -1276,7 +1305,7 @@
 void
 add_order_by(_QueryData * query, const char *orderby, gboolean reverse)
    {
-   static int count = 0;
+   /* static int count = 0; */
 
    /* trace_functioncall(); */
    if (query->orderby)
@@ -1530,6 +1559,7 @@
 oql_add_complex_constraint(_QueryData * q, oql_constraint * c)
    {
    q->complex = g_list_append(q->complex, c);
+   return FALSE;
    }
 
 static void
@@ -1566,7 +1596,7 @@
 oql_add_complex_constraint_to_sql(_QueryData * q, odl_class * cl, DBType db, 
oql_constraint * c, GString * buf)
    {
    GList *l;
-   gboolean need_and = FALSE;
+   /* gboolean need_and = FALSE; */
    char *logic;
    char *quoted;
    const char *classname = odl_class_get_full_name(cl);
@@ -1657,6 +1687,27 @@
          quoted = oql_quote_value(temp, db);
          g_free(temp);
          break;
+        case q_notequals:
+          /* TODO */
+          break;
+        case q_notlessthan:
+          /* TODO */
+          break;
+        case q_notgreaterthan:
+          /* TODO */
+          break;
+        case q_notcontains:
+          /* TODO */
+          break;
+        case q_notstartswith:
+          /* TODO */
+          break;
+        case q_notendswith:
+          /* TODO */
+          break;
+        case q_hackish:
+          /* TODO */
+          break;
          }
 
       /* add the value to test */