Cleanup with gcc.

diff --git a/servers/is/dmp_fs.c b/servers/is/dmp_fs.c
index f9d76935dab95bcc3d61a611ef5a2a86f06b0c9d..35fe032d91bd83fa7f560921453c11a5fddb3e2b 100644 (file)
--- 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 ee6a1ae79ec615af3eaf58f41413d7abf0e7e589..7ec19bf50d67e6ede5c6a78786915ae8e6c84a43 100644 (file)
--- 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 b26304498057802c1e1a073df5d3f5f0a6474557..dbbc57e87a1aef318a7c13ad214f56d41a53c70a 100644 (file)
--- 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 5299308a61ca10dd8af23809e55899bd917ce404..1411708522e5ac98412bc490256ae5469111b07e 100644 (file)
--- 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)                          );