panic prints a newline for you, don't do it in the panic string

3 files changed, 9 insertions, 9 deletions

diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.c b/sys/arch/mvme68k/stand/netboot/dev_net.c
index 241b3ac47df..38192ff7626 100644
--- a/sys/arch/mvme68k/stand/netboot/dev_net.c
+++ b/sys/arch/mvme68k/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_net.c,v 1.6 1996/05/16 02:55:36 chuck Exp $ */
+/*	$OpenBSD: dev_net.c,v 1.7 1999/01/11 05:11:41 millert Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -191,7 +191,7 @@ machdep_common_ether(ether)
 		ea = (u_char *) ETHER_ADDR_147;
 
 		if ((*(int *) ea & 0x2fffff00) == 0x2fffff00)
-			panic("ERROR: ethernet address not set!\r\n");
+			panic("ERROR: ethernet address not set!");
 		ether[0] = 0x08;
 		ether[1] = 0x00;
 		ether[2] = 0x3e;
@@ -202,7 +202,7 @@ machdep_common_ether(ether)
 		ea = (u_char *) ETHER_ADDR_16X;
 
 		if (ea[0] + ea[1] + ea[2] + ea[3] + ea[4] + ea[5] == 0)
-			panic("ERROR: ethernet address not set!\r\n");
+			panic("ERROR: ethernet address not set!");
 		ether[0] = ea[0];
 		ether[1] = ea[1];
 		ether[2] = ea[2];
diff --git a/sys/arch/mvme68k/stand/netboot/if_ie.c b/sys/arch/mvme68k/stand/netboot/if_ie.c
index c688d625fce..feb174df23d 100644
--- a/sys/arch/mvme68k/stand/netboot/if_ie.c
+++ b/sys/arch/mvme68k/stand/netboot/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.5 1996/05/16 02:55:36 chuck Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.6 1999/01/11 05:11:41 millert Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -150,7 +150,7 @@ ie_error(nif, str, ier)
 	char   *str;
 	volatile struct iereg *ier;
 {
-	panic("ie%d: unknown error\n", nif->nif_unit);
+	panic("ie%d: unknown error", nif->nif_unit);
 }
 
 ieack(ier, iem)
diff --git a/sys/arch/mvme68k/stand/netboot/if_le.c b/sys/arch/mvme68k/stand/netboot/if_le.c
index d3ded1d6070..3ca8000c03f 100644
--- a/sys/arch/mvme68k/stand/netboot/if_le.c
+++ b/sys/arch/mvme68k/stand/netboot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.6 1996/05/16 02:55:37 chuck Exp $ */
+/*	$OpenBSD: if_le.c,v 1.7 1999/01/11 05:11:41 millert Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -174,7 +174,7 @@ le_error(nif, str, ler1)
 {
 	/* ler1->ler1_rap = LE_CSRO done in caller */
 	if (ler1->ler1_rdp & LE_C0_BABL)
-		panic("le%d: been babbling, found by '%s'\n", nif->nif_unit, str);
+		panic("le%d: been babbling, found by '%s'", nif->nif_unit, str);
 	if (ler1->ler1_rdp & LE_C0_CERR) {
 		le_stats.collision_error++;
 		ler1->ler1_rdp = LE_C0_CERR;
@@ -299,12 +299,12 @@ le_poll(desc, pkt, len)
 		goto cleanup;
 	}
 	if ((rmd->rmd1_bits & (LE_R1_STP | LE_R1_ENP)) != (LE_R1_STP | LE_R1_ENP))
-		panic("le_poll: chained packet\n");
+		panic("le_poll: chained packet");
 
 	length = rmd->rmd3;
 	if (length >= LEMTU) {
 		length = 0;
-		panic("csr0 when bad things happen: %x\n", ler1->ler1_rdp);
+		panic("csr0 when bad things happen: %x", ler1->ler1_rdp);
 		goto cleanup;
 	}
 	if (!length)