From: Jorrit Herder <jnherder@minix3.org>
Date: Thu, 25 Aug 2005 12:04:36 +0000 (+0000)
Subject: Cleanup with gcc.
X-Git-Tag: v3.1.0~283
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=a238c1ba48164e9435e29321a703e051bbe00017;p=minix.git

Cleanup with gcc.
---

diff --git a/servers/is/dmp_fs.c b/servers/is/dmp_fs.c
index f9d76935d..35fe032d9 100644
--- a/servers/is/dmp_fs.c
+++ b/servers/is/dmp_fs.c
@@ -54,11 +54,6 @@ PUBLIC void fproc_dmp()
 PUBLIC void dtab_dmp()
 {
     int i;
-    char *file[] = {
-        "not used  ", "/dev/mem  ", "/dev/fd0  ", "/dev/c0   ", "/dev/tty0 ", 
-        "/dev/tty  ", "/dev/lp   ", "/dev/ip   ", "/dev/c1   ", "not used  ",
-        "/dev/c2   ", "not used  ", "/dev/c3   ", "/dev/audio", "/dev/mixer",
-    };
 
     getsysinfo(FS_PROC_NR, SI_DMAP_TAB, dmap);
     
@@ -69,17 +64,6 @@ PUBLIC void dtab_dmp()
         if (dmap[i].dmap_driver == 0) continue;
         printf("%5d  ", i);
         printf("%4d\n", dmap[i].dmap_driver);
-        
-#if DEAD_CODE
-        if (dmap[i].dmap_opcl == no_dev)  		printf("  no_dev");	
-        else if (dmap[i].dmap_opcl == gen_opcl)		printf("gen_opcl");
-        else 				printf("%8x", dmap[i].dmap_opcl);
-        
-        if ((void *)dmap[i].dmap_io == (void *)no_dev)	printf("  no_dev");
-        else if (dmap[i].dmap_io == gen_io)		printf("  gen_io");
-        else 				printf("%8x", dmap[i].dmap_io);
-#endif
-
     }
 }
 
diff --git a/servers/is/dmp_kernel.c b/servers/is/dmp_kernel.c
index ee6a1ae79..7ec19bf50 100644
--- a/servers/is/dmp_kernel.c
+++ b/servers/is/dmp_kernel.c
@@ -74,7 +74,6 @@ PUBLIC void kmessages_dmp()
 {
   struct kmessages kmess;		/* get copy of kernel messages */
   char print_buf[KMESS_BUF_SIZE+1];	/* this one is used to print */
-  int next, size;			/* vars returned by sys_kmess() */
   int start;				/* calculate start of messages */
   int r;
 
@@ -132,7 +131,7 @@ PUBLIC void monparams_dmp()
  *===========================================================================*/
 PUBLIC void irqtab_dmp()
 {
-  int i,j,r;
+  int i,r;
   struct irq_hook irq_hooks[NR_IRQ_HOOKS];
   struct irq_hook *e;	/* irq tab entry */
   char *irq[] = {
diff --git a/servers/is/is.c b/servers/is/is.c
index b26304498..dbbc57e87 100644
--- a/servers/is/is.c
+++ b/servers/is/is.c
@@ -30,7 +30,7 @@ FORWARD _PROTOTYPE(void reply, (int whom, int result)			);
 /*===========================================================================*
  *                                  main                                     *
  *===========================================================================*/
-PUBLIC void main(int argc, char **argv)
+PUBLIC int main(int argc, char **argv)
 {
 /* This is the main routine of this service. The main loop consists of 
  * three major activities: getting new work, processing the work, and
@@ -68,6 +68,7 @@ PUBLIC void main(int argc, char **argv)
 	  reply(who, result);
       }
   }
+  return(OK);				/* shouldn't come here */
 }
 
 /*===========================================================================*
diff --git a/servers/is/proto.h b/servers/is/proto.h
index 5299308a6..141170852 100644
--- a/servers/is/proto.h
+++ b/servers/is/proto.h
@@ -1,7 +1,7 @@
 /* Function prototypes. */
 
 /* main.c */
-_PROTOTYPE( void main, (int argc, char **argv)				);
+_PROTOTYPE( int  main, (int argc, char **argv)				);
 
 /* dmp.c */
 _PROTOTYPE( int do_fkey_pressed, (message *m) 				);