From 81c1b9d76db370ceab064f478bdfab00067c025a Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Tue, 3 May 2005 09:02:47 +0000
Subject: [PATCH] . FS: removed half-baked stack trace code . inet: removed
 silly error message from inet that ends up in the console   regularly .
 Makefile: added some files to the incomplete clean target

---
 servers/fs/Makefile            |  5 ----
 servers/fs/super.c             |  1 -
 servers/fs/utility.c           | 44 ----------------------------------
 servers/inet/Makefile          |  2 +-
 servers/inet/generic/ip_read.c |  8 +++++--
 5 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/servers/fs/Makefile b/servers/fs/Makefile
index cde1641e6..b012e41ee 100644
--- a/servers/fs/Makefile
+++ b/servers/fs/Makefile
@@ -250,11 +250,6 @@ utility.o:	file.h
 utility.o:	fproc.h
 utility.o:	inode.h
 utility.o:	param.h
-utility.o:	symtab.h
-
-
-symtab.h: 
-	sh makenmtab.sh $@
 
 
 write.o:	$a
diff --git a/servers/fs/super.c b/servers/fs/super.c
index 26af83132..305e6c1f0 100644
--- a/servers/fs/super.c
+++ b/servers/fs/super.c
@@ -223,7 +223,6 @@ register struct super_block *sp; /* pointer to a superblock */
   r = dev_io(DEV_READ, dev, FS_PROC_NR,
   	sbbuf, SUPER_BLOCK_BYTES, MIN_BLOCK_SIZE, 0);
   if(r != MIN_BLOCK_SIZE) {
-  	printf("dev_io failed for super block (%d)\n", r);
   	return EINVAL;
   }
   memcpy(sp, sbbuf, sizeof(*sp));
diff --git a/servers/fs/utility.c b/servers/fs/utility.c
index cb9e05ccd..2838fe5f5 100644
--- a/servers/fs/utility.c
+++ b/servers/fs/utility.c
@@ -10,12 +10,6 @@
  *   conv4:	  do byte swapping on a 32-bit long
  */
 
-#define STACKINFO 1
-
-#if STACKINFO
-#include "symtab.h"
-#endif
-
 #include "fs.h"
 #include <minix/com.h>
 #include <unistd.h>
@@ -25,40 +19,6 @@
 #include "inode.h"
 #include "param.h"
 
-#if STACKINFO
-
-struct i386_frame {
-	struct i386_frame *next;
-	int retaddr;
-	int arg0;
-};
-
-PUBLIC void
-show_stack(void)
-{
-	unsigned long *s;
-	int i, t, p = 0;
-	s = (unsigned long *) &i; 
-	for(i = 0; i < 120; i++, s++) {
-		char *symname = NULL;
-		if(!*s) continue;
-#define ELEMENTS (sizeof(fs_sym_entries)/sizeof(struct fs_sym_entry))
-		for(t = 0; t < ELEMENTS-1; t++) {
-			if(*s >= fs_sym_entries[t].symoffset &&
-			   *s <  fs_sym_entries[t+1].symoffset) {
-			   	symname = fs_sym_entries[t].symname;
-			   	break;
-			}
-		}
-		if(!symname) continue;
-		if(!(p%7)) printf("\n");
-		p++;
-		printf("%-9s ", symname);
-	}
-	printf("\n");
-}
-#endif
-
 PRIVATE int panicking;		/* inhibits recursive panics during sync */
 
 /*===========================================================================*
@@ -147,10 +107,6 @@ int num;			/* number to go with format string */
 
   if (panicking) return;	/* do not panic during a sync */
   panicking = TRUE;		/* prevent another panic during the sync */
-   
-#if STACKINFO
-  show_stack();
-#endif
 
   printf("File system panic: %s ", format);
   if (num != NO_NUM) printf("%d",num); 
diff --git a/servers/inet/Makefile b/servers/inet/Makefile
index a37f7c8a3..96c46de8e 100644
--- a/servers/inet/Makefile
+++ b/servers/inet/Makefile
@@ -41,7 +41,7 @@ install:	/usr/sbin/servers/$(SERVER)
 	install -o root -cs $? $@
 
 clean:
-	rm -f $(SERVER) *.a *.o *.bak .all
+	rm -f $(SERVER) *.a *.o */*.o */*.a *.bak .all
 
 # depencencies
 .all:	$h/com.h
diff --git a/servers/inet/generic/ip_read.c b/servers/inet/generic/ip_read.c
index 0937f0039..7fc80b7c9 100644
--- a/servers/inet/generic/ip_read.c
+++ b/servers/inet/generic/ip_read.c
@@ -774,13 +774,17 @@ assert (pack->acc_length >= IP_MIN_HDR_SIZE);
 	if (!broadcast_dst(ip_port, ip_hdr->ih_dst))
 	{
 #if !CRAMPED
-		printf(
-		"ip[%d]: broadcast packet for ip-nonbroadcast addr, src=",
+		/* this message isn't very useful, but is quite annoying on
+		 * the console
+		 */
+		/*
+		printf("ip[%d]: broadcast packet for ip-nonbroadcast addr, src=",
 			ip_port->ip_port);
 		writeIpAddr(ip_hdr->ih_src);
 		printf(" dst=");
 		writeIpAddr(ip_hdr->ih_dst);
 		printf("\n");
+		*/
 #endif
 		bf_afree(pack);
 		return;