r4281@bucket (orig r271): kcr | 2008-01-21 14:50:52 -0500

[1ts-debian.git] / zephyr / server / main.c

diff --git a/zephyr/server/main.c b/zephyr/server/main.c
index 1472e1e1a5b1f882eb1fbd27baa421d1b39aa336..9396a2bfa40374cdda1c8f4632b4c70178df7329 100644 (file)
--- a/zephyr/server/main.c
+++ b/zephyr/server/main.c
@@ -60,7 +60,6 @@ static RETSIGTYPE bye(int);
 static RETSIGTYPE dbug_on(int);
 static RETSIGTYPE dbug_off(int);
 static RETSIGTYPE sig_dump_db(int);
-static RETSIGTYPE sig_dump_strings(int);
 static RETSIGTYPE reset(int);
 static RETSIGTYPE reap(int);
 static void read_from_dump(char *dumpfile);
@@ -245,10 +244,8 @@ main(int argc,
     if (zalone)
        syslog(LOG_DEBUG, "standalone operation");
 #endif
-#if 0
     if (zdebug)
        syslog(LOG_DEBUG, "debugging on");
-#endif
 
     /* set up sockets & my_addr and myname, 
        find other servers and set up server table, initialize queues
@@ -395,7 +392,6 @@ main(int argc,
 static int
 initialize(void)
 {
-    int zero = 0;
     if (do_net_setup())
        return(1);
 
@@ -586,12 +582,6 @@ dbug_off(int sig)
 
 int fork_for_dump = 0;
 
-static RETSIGTYPE
-sig_dump_strings(int sig)
-{
-    dump_strings_flag = 1;
-}
-
 static void dump_strings(void)
 {
     char filename[128];
@@ -664,9 +654,7 @@ dump_db(void)
 static RETSIGTYPE
 reset(int sig)
 {
-#if 1
     zdbug((LOG_DEBUG,"reset()"));
-#endif
     doreset = 1;
 }
 
@@ -681,9 +669,8 @@ reap(int sig)
 #else
     union wait waitb;
 #endif
-#if 1
+
     zdbug((LOG_DEBUG,"reap()"));
-#endif
 #ifdef _POSIX_VERSION
     while ((pid = waitpid(-1, &waitb, WNOHANG)) == 0) 
       { i++; if (i > 10) break; }
@@ -721,9 +708,6 @@ do_reset(void)
 #else
     int omask;
 #endif
-#if 0
-    zdbug((LOG_DEBUG,"do_reset()"));
-#endif
 #ifdef _POSIX_VERSION
     sigemptyset(&mask);
     sigaddset(&mask, SIGHUP);