gnue/geas/src geas-server.c geas-server.h oql/o...

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/05/24 16:21:52

Modified files:
        geas/src       : geas-server.c geas-server.h 
        geas/src/oql   : oql.c 

Log message:
        moved g_strcase_hash and g_strcase_equal from geas-server.c to 
oql/oql.c, and removed some unneeded definitions from geas-server.h

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.c.diff?cvsroot=OldCVS&tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.h.diff?cvsroot=OldCVS&tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/oql.c.diff?cvsroot=OldCVS&tr1=1.50&tr2=1.51&r1=text&r2=text

Patches:
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.80 gnue/geas/src/geas-server.c:1.81
--- gnue/geas/src/geas-server.c:1.80    Thu May 24 14:41:13 2001
+++ gnue/geas/src/geas-server.c Thu May 24 16:21:51 2001
@@ -97,6 +97,12 @@
 static void reserve_sql_words( const char *file , unsigned long int dbtype );
 static void loadTableAliases( const char *filename );
 
+gboolean allow_show_version ( );
+gboolean allow_show_options ( );
+gboolean allow_show_messages( );
+gboolean allow_show_errors  ( );
+gboolean allow_show_config  ( );
+
 #ifdef ENABLE_INTERCEPT_SIGSEGV
 typedef void (*sighandler_t)(int arg);
 sighandler_t old_sigsegv = NULL;
@@ -1522,29 +1528,6 @@
    printf( "%s %s reserved in %s\n" ,
          "all" , is_word_reserved("all",OQL_DBTYPE_POSTGRESQL)?"is":"isn't" , 
"PostgreSQL" );
     */
-}
-
-/* 31 bit hash function */
-guint
-g_strcase_hash (gconstpointer key)
-{
-   const char *p = key;
-   guint h = tolower(*p);
-
-   if (h)
-     for (p += 1; *p != '\0'; p++)
-       h = (h << 5) - h + tolower(*p);
-   
-   return h;
-}
-
-gboolean          
-  g_strcase_equal (gconstpointer v1,gconstpointer v2)
-{
-   const gchar *string1 = v1;
-   const gchar *string2 = v2;
-
-   return g_strcasecmp (string1, string2) == 0;
 }
 
 #ifdef DEBUG
Index: gnue/geas/src/geas-server.h
diff -u gnue/geas/src/geas-server.h:1.37 gnue/geas/src/geas-server.h:1.38
--- gnue/geas/src/geas-server.h:1.37    Thu May 24 14:53:28 2001
+++ gnue/geas/src/geas-server.h Thu May 24 16:21:52 2001
@@ -118,7 +118,6 @@
    };
 
 /* global variables */
-extern CORBA_ORB the_orb;                /* the ORB in use */
 extern int debuglevel;                           /* configurable debugging 
output detail :
  
                                                                                
     1-10, 1 = low detail, 10 = high detail */
@@ -216,17 +215,7 @@
 #define badsecurity_printf(str,args...)         /* plugged */
 #endif
 
-gboolean allow_show_version ( );
-gboolean allow_show_options ( );
-gboolean allow_show_messages( );
-gboolean allow_show_errors  ( );
-gboolean allow_show_config  ( );
-
 gboolean allow_log_class_event( const char *classname );
-
-/* case insensitive versions of g_str_hash() and g_str_equals() */
-guint g_strcase_hash (gconstpointer key);
-gboolean g_strcase_equal (gconstpointer v1,gconstpointer v2);
 
 #ifdef DEBUG
   void wait_for_enter();
Index: gnue/geas/src/oql/oql.c
diff -u gnue/geas/src/oql/oql.c:1.50 gnue/geas/src/oql/oql.c:1.51
--- gnue/geas/src/oql/oql.c:1.50        Wed May 23 17:57:11 2001
+++ gnue/geas/src/oql/oql.c     Thu May 24 16:21:52 2001
@@ -1367,6 +1367,29 @@
 
 GHashTable *oql_reservedwords = NULL;
 
+/* 31 bit hash function */
+guint
+g_strcase_hash (gconstpointer key)
+{
+   const char *p = key;
+   guint h = tolower(*p);
+
+   if (h)
+     for (p += 1; *p != '\0'; p++)
+       h = (h << 5) - h + tolower(*p);
+   
+   return h;
+}
+
+gboolean          
+g_strcase_equal (gconstpointer v1,gconstpointer v2)
+{
+   const gchar *string1 = v1;
+   const gchar *string2 = v2;
+
+   return g_strcasecmp (string1, string2) == 0;
+}
+
 void
 quick_reserved_word(const char *word, gboolean mysql, gboolean postgresql)
    {