gnue/geas/src geas-server.c geas-server.h objec...

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/05/25 09:04:29

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

Log message:
        removed some debugging code no longer in use

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.c.diff?cvsroot=OldCVS&tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.h.diff?cvsroot=OldCVS&tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectcache/objectcache.c.diff?cvsroot=OldCVS&tr1=1.41&tr2=1.42&r1=text&r2=text

Patches:
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.82 gnue/geas/src/geas-server.c:1.83
--- gnue/geas/src/geas-server.c:1.82    Fri May 25 08:46:50 2001
+++ gnue/geas/src/geas-server.c Fri May 25 09:04:28 2001
@@ -1531,17 +1531,6 @@
     */
 }
 
-#ifdef DEBUG
-void
-wait_for_enter()
-{
-   char buf[128];
-   printf( "Press ENTER to continue.\n" );
-   fflush(NULL);
-   gets( buf );
-}
-#endif
-
 struct DatabaseAliases
 {
    char *databasename;
Index: gnue/geas/src/geas-server.h
diff -u gnue/geas/src/geas-server.h:1.39 gnue/geas/src/geas-server.h:1.40
--- gnue/geas/src/geas-server.h:1.39    Fri May 25 08:46:50 2001
+++ gnue/geas/src/geas-server.h Fri May 25 09:04:28 2001
@@ -131,8 +131,6 @@
  * 10 = absolutely everything
  */
 
-/* use these in trace_debug() statements */
-
 /* set debuglevel in geas.conf to the numbers to get that level of detail */
 
 /* intermediate levels are, of course, allowed */
@@ -171,47 +169,13 @@
  * is not enforced
  */
 #ifdef DEBUG
-
-# define trace_debug(level,str,args...) \
-debug_output_f("debug",level,__FILE__,__PRETTY_FUNCTION__,__LINE__ , str , 
##args )
-
-#define temp_trace_debug(str,args...) \
-debug_output_f("temp 
debug",DEBUGLEVEL_ALWAYS,__FILE__,__PRETTY_FUNCTION__,__LINE__ , str , ##args )
-
 #define debug_output(level,str,args...) \
 debug_output_f(NULL,level,NULL,NULL,0,str,##args)
-
 #else
-#define trace_debug(level,str,args...)          /* empty */
-#define temp_trace_debug(str,args...)           /* empty */
 #define debug_output(level,str,args...)          /* empty */
 #endif
 
-#ifdef DEBUG
-# define trace_notdone() \
-debug_output_f("notdone", TRACE_NOTDONE, __FILE__, __PRETTY_FUNCTION__, 
__LINE__ , "" )
-#define trace_notcomplete(str,args...) \
-debug_output_f("notcomplete",TRACE_NOTDONE,__FILE__,__PRETTY_FUNCTION__,__LINE__
 , str , ##args )
-#else
-#define trace_notdone()                                                        
 /* empty */
-#define trace_notcomplete(str,args...)          /* empty */
-
-#endif
-
-#if DEBUG_SECURITY
-#define badsecurity_printf(str,args...) \
-debug_output_f("SECURITY 
HOLE:",DEBUGLEVEL_ALWAYS,__FILE__,__PRETTY_FUNCTION__,__LINE__ , str , ##args )
-#else
-#define badsecurity_printf(str,args...)         /* plugged */
-#endif
-
 gboolean allow_log_class_event( const char *classname );
-
-#ifdef DEBUG
-  void wait_for_enter();
-#else
-  #define wait_for_enter() /* DEBUG mode only */
-#endif
 
 #endif
 
Index: gnue/geas/src/objectcache/objectcache.c
diff -u gnue/geas/src/objectcache/objectcache.c:1.41 
gnue/geas/src/objectcache/objectcache.c:1.42
--- gnue/geas/src/objectcache/objectcache.c:1.41        Fri May 25 08:46:50 2001
+++ gnue/geas/src/objectcache/objectcache.c     Fri May 25 09:04:29 2001
@@ -317,10 +317,6 @@
       printf( "still in flushable list: %08lx (bad 0)\n" , object );
       abort();
    }
-   /* else printf( "%08lx not in flushable (good 1)\n" , object ); */
-   /* message( "remove object '%s/%s' from cache\n" , obj->classname,obj->key 
); */
-   /* wait_for_enter(); */
-
    /* remove it */
    g_hash_table_remove(cachedata, obj->hashkey);
    oc_free_object_data(object);
@@ -947,7 +943,6 @@
             /* printf( "Complete remove done\n" ); */
          }
      }
-   /* wait_for_enter(); */
    g_free( objhash );
 }
 
@@ -966,8 +961,6 @@
 
    objhash = oc_make_object_index_hash( object , indexid->index );
    if( !objhash ) return;
-
-   /* wait_for_enter(); */
 
    /* find the index, if it exists */
    idx = g_hash_table_lookup(indexes,indexid->indexid);