XEmacs 21.2.28 "Hermes".

[chise/xemacs-chise.git.1] / lib-src / gnuserv.c

diff --git a/lib-src/gnuserv.c b/lib-src/gnuserv.c
index 39f9147..a1e74ab 100644 (file)
--- a/lib-src/gnuserv.c
+++ b/lib-src/gnuserv.c
@@ -73,7 +73,7 @@ main ()
 #ifdef SYSV_IPC
 
 int ipc_qid = 0;               /* ipc message queue id */
-int ipc_wpid = 0;              /* watchdog task pid */
+pid_t ipc_wpid = 0;            /* watchdog task pid */
 
 
 /*
@@ -111,7 +111,7 @@ ipc_spawn_watchdog (void)
 {
   if ((ipc_wpid = fork ()) == 0)
     { /* child process */
-      int ppid = getppid ();   /* parent's process id */
+      pid_t ppid = getppid (); /* parent's process id */
 
       setpgrp();               /* gnu kills process group on exit */
 
@@ -323,7 +323,7 @@ handle_response (void)
   char buf[GSERV_BUFSZ+1];
   int offset=0;
   int s;
-  int len;
+  int len = 0;
   int result_len;
 
   /* read in "n/m:" (n=client fd, m=message length) */
@@ -563,7 +563,7 @@ add_host (u_long host_addr)
 
 
 /*
-  setup_table -- initialise the table of hosts allowed to contact the server,
+  setup_table -- initialize the table of hosts allowed to contact the server,
                  by reading from the file specified by the GNU_SECURE
                 environment variable
                  Put in the local machine, and, if a security file is specifed,
@@ -699,7 +699,7 @@ handle_internet_request (int ls)
 
   memset((char *)&peer,0,sizeof(struct sockaddr_in));
 
-  if ((s = accept(ls,(struct sockaddr *)&peer, (void *) &addrlen)) == -1)
+  if ((s = accept(ls,(struct sockaddr *)&peer, &addrlen)) == -1)
     {
       perror(progname);
       fprintf(stderr,"%s: unable to accept\n",progname);
@@ -819,7 +819,7 @@ handle_unix_request (int ls)
 
   server.sun_family = AF_UNIX;
 
-  if ((s = accept(ls,(struct sockaddr *)&server, (void *)&len)) < 0)
+  if ((s = accept(ls,(struct sockaddr *)&server, &len)) < 0)
     {
       perror(progname);
       fprintf(stderr,"%s: unable to accept\n",progname);
@@ -832,9 +832,7 @@ handle_unix_request (int ls)
 
 
 int
-main(argc,argv)
-     int argc;
-     char *argv[];
+main (int argc, char *argv[])
 {
   int chan;                    /* temporary channel number */
 #ifdef SYSV_IPC
@@ -867,7 +865,7 @@ main(argc,argv)
 #endif /* SYSV_IPC */
 
 #ifdef INTERNET_DOMAIN_SOCKETS
-  ils = internet_init();       /* get a internet domain socket to listen on */
+  ils = internet_init();       /* get an internet domain socket to listen on */
 #endif /* INTERNET_DOMAIN_SOCKETS */
 
 #ifdef UNIX_DOMAIN_SOCKETS