diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-01-11 05:12:41 +0000 |
commit | b3067fd524234e263e58b215d0fb24d414bf1c34 (patch) | |
tree | 5c1576265dded5700ab387af81051fabd39f3396 /sys/arch/kbus/stand | |
parent | 9ee95b4b405b050512cf782b508d774f4601a6b5 (diff) |
panic prints a newline for you, don't do it in the panic string
Diffstat (limited to 'sys/arch/kbus/stand')
-rw-r--r-- | sys/arch/kbus/stand/netboot/dev_net.c | 10 | ||||
-rw-r--r-- | sys/arch/kbus/stand/netboot/if_le.c | 8 | ||||
-rw-r--r-- | sys/arch/kbus/stand/sk/dev_net.c | 10 | ||||
-rw-r--r-- | sys/arch/kbus/stand/sk/if_le.c | 12 |
4 files changed, 20 insertions, 20 deletions
diff --git a/sys/arch/kbus/stand/netboot/dev_net.c b/sys/arch/kbus/stand/netboot/dev_net.c index 63f5e85a180..1fa0ec84fb9 100644 --- a/sys/arch/kbus/stand/netboot/dev_net.c +++ b/sys/arch/kbus/stand/netboot/dev_net.c @@ -1,4 +1,4 @@ -/* $Id: dev_net.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */ +/* $Id: dev_net.c,v 1.2 1999/01/11 05:11:30 millert Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -189,7 +189,7 @@ machdep_common_ether(ether) int i; if (ea == NULL) - panic ("ERROR: ethernet address not set!\n"); + panic ("ERROR: ethernet address not set!"); else printf ("Try to parse %s\n", ea); @@ -202,7 +202,7 @@ machdep_common_ether(ether) else if (*ea >= 'A' && *ea <= 'F') c = *ea - 'A' + 10; else - panic ("Bad character for enet addr (%s)\n", ea); + panic ("Bad character for enet addr (%s)", ea); ea++; if (i == 5 && *ea == 0) break; @@ -220,10 +220,10 @@ machdep_common_ether(ether) else if (*ea >= 'A' && *ea <= 'F') c |= *ea - 'A' + 10; else - panic ("Bad character for enet addr (%s)\n", ea); + panic ("Bad character for enet addr (%s)", ea); ea++; if (i != 5 && *ea != ':') - panic ("Bad character for enet addr (%s)\n", ea); + panic ("Bad character for enet addr (%s)", ea); ea++; *ether++ = c; } diff --git a/sys/arch/kbus/stand/netboot/if_le.c b/sys/arch/kbus/stand/netboot/if_le.c index 4901da5fd44..68b8ea5413f 100644 --- a/sys/arch/kbus/stand/netboot/if_le.c +++ b/sys/arch/kbus/stand/netboot/if_le.c @@ -1,4 +1,4 @@ -/* $Id: if_le.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */ +/* $Id: if_le.c,v 1.2 1999/01/11 05:11:30 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -170,7 +170,7 @@ le_error(nif, str, ler1) printf ("le_error (%s) C0: %b\n", str, ler1->ler1_rdp, LE_C0_BITS); /* ler1->ler1_rap = LE_CSRO done in caller */ if (ler1->ler1_rdp & LE_C0_BABL) - panic("le%d: been babbling, found by '%s'\n", + panic("le%d: been babbling, found by '%s'", nif->nif_unit, str); if (ler1->ler1_rdp & LE_C0_CERR) { le_stats.collision_error++; @@ -314,12 +314,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) diff --git a/sys/arch/kbus/stand/sk/dev_net.c b/sys/arch/kbus/stand/sk/dev_net.c index bffda185afa..64371891759 100644 --- a/sys/arch/kbus/stand/sk/dev_net.c +++ b/sys/arch/kbus/stand/sk/dev_net.c @@ -1,4 +1,4 @@ -/* $Id: dev_net.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */ +/* $Id: dev_net.c,v 1.2 1999/01/11 05:11:31 millert Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -189,7 +189,7 @@ machdep_common_ether(ether) int i; if (ea == NULL) - panic ("ERROR: ethernet address not set!\n"); + panic ("ERROR: ethernet address not set!"); else printf ("Try to parse %s\n", ea); @@ -202,7 +202,7 @@ machdep_common_ether(ether) else if (*ea >= 'A' && *ea <= 'F') c = *ea - 'A' + 10; else - panic ("Bad character for enet addr (%s)\n", ea); + panic ("Bad character for enet addr (%s)", ea); ea++; if (i == 5 && *ea == 0) break; @@ -220,10 +220,10 @@ machdep_common_ether(ether) else if (*ea >= 'A' && *ea <= 'F') c |= *ea - 'A' + 10; else - panic ("Bad character for enet addr (%s)\n", ea); + panic ("Bad character for enet addr (%s)", ea); ea++; if (i != 5 && *ea != ':') - panic ("Bad character for enet addr (%s)\n", ea); + panic ("Bad character for enet addr (%s)", ea); ea++; *ether++ = c; } diff --git a/sys/arch/kbus/stand/sk/if_le.c b/sys/arch/kbus/stand/sk/if_le.c index 0fa04fad29f..b295a091246 100644 --- a/sys/arch/kbus/stand/sk/if_le.c +++ b/sys/arch/kbus/stand/sk/if_le.c @@ -1,4 +1,4 @@ -/* $Id: if_le.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */ +/* $Id: if_le.c,v 1.2 1999/01/11 05:11:31 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -172,7 +172,7 @@ le_error(nif, str, ler1) printf ("le_error (%s) C0: %b\n", str, ler1->ler1_rdp, LE_C0_BITS); /* ler1->ler1_rap = LE_CSRO done in caller */ if (ler1->ler1_rdp & LE_C0_BABL) - panic("le%d: been babbling, found by '%s'\n", + panic("le%d: been babbling, found by '%s'", nif->nif_unit, str); if (ler1->ler1_rdp & LE_C0_CERR) { le_stats.collision_error++; @@ -315,12 +315,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) @@ -578,13 +578,13 @@ le_intr (void) 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) |