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 1e2bb7ce2b1da81cb62a32258ac7fdd516f02927..9396a2bfa40374cdda1c8f4632b4c70178df7329 100644 (file)
--- a/zephyr/server/main.c
+++ b/zephyr/server/main.c
@@ -52,23 +52,22 @@ static const char rcsid_main_c[] =
 
 #define        EVER            (;;)            /* don't stop looping */
 
-static int do_net_setup __P((void));
-static int initialize __P((void));
-static void usage __P((void));
-static void do_reset __P((void));
-static RETSIGTYPE bye __P((int));
-static RETSIGTYPE dbug_on __P((int));
-static RETSIGTYPE dbug_off __P((int));
-static RETSIGTYPE sig_dump_db __P((int));
-static RETSIGTYPE sig_dump_strings __P((int));
-static RETSIGTYPE reset __P((int));
-static RETSIGTYPE reap __P((int));
-static void read_from_dump __P((char *dumpfile));
-static void dump_db __P((void));
-static void dump_strings __P((void));
+static int do_net_setup(void);
+static int initialize(void);
+static void usage(void);
+static void do_reset(void);
+static RETSIGTYPE bye(int);
+static RETSIGTYPE dbug_on(int);
+static RETSIGTYPE dbug_off(int);
+static RETSIGTYPE sig_dump_db(int);
+static RETSIGTYPE reset(int);
+static RETSIGTYPE reap(int);
+static void read_from_dump(char *dumpfile);
+static void dump_db(void);
+static void dump_strings(void);
 
 #ifndef DEBUG
-static void detach __P((void));
+static void detach(void);
 #endif
 
 static short doreset = 0;              /* if it becomes 1, perform
@@ -144,9 +143,8 @@ C_Block __Zephyr_session;
 #endif
 
 int
-main(argc, argv)
-    int argc;
-    char **argv;
+main(int argc,
+     char **argv)
 {
     int nfound;                        /* #fildes ready on select */
     fd_set readable;
@@ -177,7 +175,7 @@ main(argc, argv)
     programname = (programname) ? programname + 1 : argv[0];
 
     /* process arguments */
-    while ((optchar = getopt(argc, argv, "dsnv4:f:k:")) != EOF) {
+    while ((optchar = getopt(argc, argv, "dsnv4f:k:")) != EOF) {
        switch(optchar) {
          case 'd':
            zdebug = 1;
@@ -246,10 +244,8 @@ main(argc, argv)
     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
@@ -394,9 +390,8 @@ main(argc, argv)
    */
 
 static int
-initialize()
+initialize(void)
 {
-    int zero = 0;
     if (do_net_setup())
        return(1);
 
@@ -452,7 +447,7 @@ initialize()
  */
 
 static int
-do_net_setup()
+do_net_setup(void)
 {
     struct servent *sp;
     struct hostent *hp;
@@ -522,7 +517,7 @@ do_net_setup()
  */
 
 static void
-usage()
+usage(void)
 {
 #ifdef DEBUG
        fprintf(stderr, "Usage: %s [-d] [-s] [-n] [-k realm] [-f dumpfile]\n",
@@ -535,7 +530,7 @@ usage()
 }
 
 int
-packets_waiting()
+packets_waiting(void)
 {
     fd_set readable, initial;
     struct timeval tv;
@@ -550,8 +545,7 @@ packets_waiting()
 }
 
 static RETSIGTYPE
-bye(sig)
-    int sig;
+bye(int sig)
 {
     server_shutdown();         /* tell other servers */
 #ifdef REALM_MGMT
@@ -567,8 +561,7 @@ bye(sig)
 }
 
 static RETSIGTYPE
-dbug_on(sig)
-    int sig;
+dbug_on(int sig)
 {
     syslog(LOG_DEBUG, "debugging turned on");
 #ifdef DEBUG_MALLOC
@@ -578,8 +571,7 @@ dbug_on(sig)
 }
 
 static RETSIGTYPE
-dbug_off(sig)
-    int sig;
+dbug_off(int sig)
 {
     syslog(LOG_DEBUG, "debugging turned off");
 #ifdef DEBUG_MALLOC
@@ -590,14 +582,7 @@ dbug_off(sig)
 
 int fork_for_dump = 0;
 
-static RETSIGTYPE
-sig_dump_strings(sig)
-    int sig;
-{
-    dump_strings_flag = 1;
-}
-
-static void dump_strings()
+static void dump_strings(void)
 {
     char filename[128];
 
@@ -624,13 +609,13 @@ static void dump_strings()
 }
 
 static RETSIGTYPE
-sig_dump_db(sig)
-    int sig;
+sig_dump_db(int sig)
 {
     dump_db_flag = 1;
 }
 
-static void dump_db()
+static void
+dump_db(void)
 {
     /* dump the in-core database to human-readable form on disk */
     FILE *fp;
@@ -667,18 +652,14 @@ static void dump_db()
 }
 
 static RETSIGTYPE
-reset(sig)
-    int sig;
+reset(int sig)
 {
-#if 1
     zdbug((LOG_DEBUG,"reset()"));
-#endif
     doreset = 1;
 }
 
 static RETSIGTYPE
-reap(sig)
-    int sig;
+reap(int sig)
 {
     int pid, i = 0;
     int oerrno = errno;
@@ -688,9 +669,8 @@ reap(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; }
@@ -720,7 +700,7 @@ reap(sig)
 }
 
 static void
-do_reset()
+do_reset(void)
 {
     int oerrno = errno;
 #ifdef _POSIX_VERSION
@@ -728,9 +708,6 @@ do_reset()
 #else
     int omask;
 #endif
-#if 0
-    zdbug((LOG_DEBUG,"do_reset()"));
-#endif
 #ifdef _POSIX_VERSION
     sigemptyset(&mask);
     sigaddset(&mask, SIGHUP);
@@ -759,7 +736,7 @@ do_reset()
  */
 
 static void
-detach()
+detach(void)
 {
     /* detach from terminal and fork. */
     int i;
@@ -793,8 +770,7 @@ detach()
 #endif /* not DEBUG */
 
 static void
-read_from_dump(dumpfile)
-    char *dumpfile;
+read_from_dump(char *dumpfile)
 {
     /* Not yet implemented. */
     return;