diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-10-09 23:43:12 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-10-09 23:43:12 +0000 |
commit | 7fe821d45d2fd0c6ca0edd62f5b4efcf9e53e4b0 (patch) | |
tree | 31e7dad9c1c55e779ae321a8c95cfe5ec3d6d03f /sys | |
parent | 115a56b437e49fe2ea3d826359ab58dad9f5a11d (diff) |
Remove trailing '\n's from panic messages.
Started by a commit to siop from provos@netbsd.org.
ok miod@ millert@
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ic/aic7xxx.c | 20 | ||||
-rw-r--r-- | sys/dev/ic/aic7xxx_inline.h | 4 | ||||
-rw-r--r-- | sys/dev/ic/dp8390.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/dpt.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/i82596.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/iha.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/ncr53c9x.c | 10 | ||||
-rw-r--r-- | sys/dev/ic/siop_common.c | 8 | ||||
-rw-r--r-- | sys/dev/ic/wdc.c | 6 |
9 files changed, 33 insertions, 33 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index 7388d771c62..4937830f3eb 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -28,10 +28,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx.c,v 1.41 2002/07/05 05:41:03 smurph Exp $ + * $Id: aic7xxx.c,v 1.42 2002/10/09 23:43:10 krw Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.80 2001/12/16 17:38:30 gibbs Exp $ - * $OpenBSD: aic7xxx.c,v 1.41 2002/07/05 05:41:03 smurph Exp $ + * $OpenBSD: aic7xxx.c,v 1.42 2002/10/09 23:43:10 krw Exp $ */ #ifdef __OpenBSD__ @@ -722,7 +722,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) if (devinfo.role == ROLE_INITIATOR) { if (scb == NULL) panic("HOST_MSG_LOOP with " - "invalid SCB %x\n", scb_index); + "invalid SCB %x", scb_index); if (bus_phase == P_MESGOUT) ahc_setup_initiator_msgout(ahc, @@ -2256,7 +2256,7 @@ ahc_build_transfer_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo) if (!dowide && !dosync && !doppr) { panic("ahc_intr: AWAITING_MSG for negotiation, " - "but no negotiation needed\n"); + "but no negotiation needed"); } use_ppr = (tinfo->curr.transport_version >= 3) || doppr; @@ -5106,7 +5106,7 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel, if (scb == NULL) { printf("qinpos = %d, SCB index = %d\n", qinpos, ahc->qinfifo[qinpos]); - panic("Loop 1\n"); + panic("Loop 1"); } if (ahc_match_scb(ahc, scb, target, channel, lun, tag, role)) { @@ -5172,7 +5172,7 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel, if (scb == NULL) { printf("found = %d, qinstart = %d, qinfifionext = %d\n", found, qinstart, ahc->qinfifonext); - panic("First/Second Qinfifo fixup\n"); + panic("First/Second Qinfifo fixup"); } /* * ahc_swap_with_next_hscb forces our next pointer to @@ -5218,7 +5218,7 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel, if (scb == NULL) { printf("scb_index = %d, next = %d\n", scb_index, next); - panic("Waiting List traversal\n"); + panic("Waiting List traversal"); } if (ahc_match_scb(ahc, scb, target, channel, lun, SCB_LIST_NULL, role)) { @@ -5844,7 +5844,7 @@ ahc_calc_residual(struct scb *scb) /* Case 4 */ return; } else if ((resid_sgptr & ~SG_PTR_MASK) != 0) { - panic("Bogus resid sgptr value 0x%x\n", resid_sgptr); + panic("Bogus resid sgptr value 0x%x", resid_sgptr); } else { struct ahc_dma_seg *sg; @@ -6209,7 +6209,7 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts) * (AND with an immediate of FF). */ if (fmt1_ins->immediate != 1) - panic("%s: BMOV not supported\n", + panic("%s: BMOV not supported", ahc_name(ahc)); fmt1_ins->opcode = AIC_OP_AND; fmt1_ins->immediate = 0xff; @@ -6769,7 +6769,7 @@ ahc_update_scsiid(struct ahc_softc *ahc, u_int targid_mask) u_int scsiid; if ((ahc->features & AHC_MULTI_TID) == 0) - panic("ahc_update_scsiid called on non-multitid unit\n"); + panic("ahc_update_scsiid called on non-multitid unit"); /* * Since we will rely on the the TARGID mask diff --git a/sys/dev/ic/aic7xxx_inline.h b/sys/dev/ic/aic7xxx_inline.h index 6f84f2ec548..a3ed48f8cef 100644 --- a/sys/dev/ic/aic7xxx_inline.h +++ b/sys/dev/ic/aic7xxx_inline.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx_inline.h,v 1.3 2002/06/28 00:34:54 smurph Exp $ + * $Id: aic7xxx_inline.h,v 1.4 2002/10/09 23:43:11 krw Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_inline.h,v 1.17 2001/07/18 21:39:47 gibbs Exp $ */ @@ -372,7 +372,7 @@ ahc_queue_scb(struct ahc_softc *ahc, struct scb *scb) if (scb->hscb->tag == SCB_LIST_NULL || scb->hscb->next == SCB_LIST_NULL) - panic("Attempt to queue invalid SCB tag %x:%x\n", + panic("Attempt to queue invalid SCB tag %x:%x", scb->hscb->tag, scb->hscb->next); /* diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c index 6a1ca66fa5b..785751813b7 100644 --- a/sys/dev/ic/dp8390.c +++ b/sys/dev/ic/dp8390.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dp8390.c,v 1.23 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: dp8390.c,v 1.24 2002/10/09 23:43:11 krw Exp $ */ /* $NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $ */ /* @@ -391,7 +391,7 @@ dp8390_xmit(sc) sc->txb_next_tx, sc->txb_inuse, sc->txb_cnt, sc->txb_new); if (sc->txb_inuse == 0) - panic("dp8390_xmit: no packets to xmit\n"); + panic("dp8390_xmit: no packets to xmit"); #endif len = sc->txb_len[sc->txb_next_tx]; diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c index d5d97556797..1fb14a98187 100644 --- a/sys/dev/ic/dpt.c +++ b/sys/dev/ic/dpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dpt.c,v 1.6 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: dpt.c,v 1.7 2002/10/09 23:43:11 krw Exp $ */ /* $NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $ */ /*- @@ -525,7 +525,7 @@ dpt_poll(sc, ccb) #ifdef DEBUG if ((ccb->ccb_flg & CCB_PRIVATE) == 0) - panic("dpt_poll: called for non-CCB_PRIVATE request\n"); + panic("dpt_poll: called for non-CCB_PRIVATE request"); #endif if ((ccb->ccb_flg & CCB_INTR) != 0) @@ -819,7 +819,7 @@ dpt_done_ccb(sc, ccb) */ #ifdef DIAGNOSTIC if ((ccb->ccb_flg & CCB_ALLOC) == 0) { - panic("%s: done ccb not allocated!\n", sc->sc_dv.dv_xname); + panic("%s: done ccb not allocated!", sc->sc_dv.dv_xname); return; } #endif diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c index c48f419c259..f0806f7351b 100644 --- a/sys/dev/ic/i82596.c +++ b/sys/dev/ic/i82596.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82596.c,v 1.12 2002/09/23 06:11:50 mickey Exp $ */ +/* $OpenBSD: i82596.c,v 1.13 2002/10/09 23:43:11 krw Exp $ */ /* $NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $ */ /*- @@ -1537,7 +1537,7 @@ i82596_setup_bufs(sc) sc->nframes = n / r; if (sc->nframes <= 0) - panic("ie: bogus buffer calc\n"); + panic("ie: bogus buffer calc"); sc->nrxbuf = sc->nframes * B_PER_F; diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c index ba6d6e62dac..08bcad9bad2 100644 --- a/sys/dev/ic/iha.c +++ b/sys/dev/ic/iha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iha.c,v 1.14 2002/06/09 02:11:47 jsyn Exp $ */ +/* $OpenBSD: iha.c,v 1.15 2002/10/09 23:43:11 krw Exp $ */ /* * Initio INI-9xxxU/UW SCSI Device Driver * @@ -2686,7 +2686,7 @@ iha_read_eeprom(iot, ioh, nvram) if ((nvram->NVM_Signature != SIGNATURE) || (nvram->NVM_CheckSum != chksum)) - panic("iha: invalid EEPROM, bad signature or checksum\n"); + panic("iha: invalid EEPROM, bad signature or checksum"); } /* diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index d92e3566672..8a8c2be8977 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.15 2002/09/04 22:08:06 fgsch Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.16 2002/10/09 23:43:11 krw Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */ /* @@ -984,7 +984,7 @@ ncr53c9x_sched(sc) } #ifdef DIAGNOSTIC if (i == 256) - panic("ncr53c9x_sched: tag alloc failure\n"); + panic("ncr53c9x_sched: tag alloc failure"); #endif /* Save where to start next time. */ @@ -1160,7 +1160,7 @@ ncr53c9x_dequeue(sc, ecb) li = TINFO_LUN(ti, lun); #ifdef DIAGNOSTIC if ((!li) || (li->lun != lun)) - panic("ncr53c9x_dequeue: lun %qx for ecb %p does not exist\n", + panic("ncr53c9x_dequeue: lun %qx for ecb %p does not exist", (long long)lun, ecb); #endif if (li->untagged == ecb) { @@ -1171,7 +1171,7 @@ ncr53c9x_dequeue(sc, ecb) #ifdef DIAGNOSTIC if (li->queued[ecb->tag[1]] && (li->queued[ecb->tag[1]] != ecb)) panic("ncr53c9x_dequeue: slot %d for lun %qx has %p " - "instead of ecb %p\n", ecb->tag[1], + "instead of ecb %p", ecb->tag[1], (long long)lun, li->queued[ecb->tag[1]], ecb); #endif @@ -1229,7 +1229,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *sc, int how) buf = sc->sc_imess + sc->sc_imlen; break; default: - panic("ncr53c9x_rdfifo: bad flag\n"); + panic("ncr53c9x_rdfifo: bad flag"); break; } diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c index 0144b30fa98..c9b10ac5085 100644 --- a/sys/dev/ic/siop_common.c +++ b/sys/dev/ic/siop_common.c @@ -1,5 +1,5 @@ -/* $OpenBSD: siop_common.c,v 1.14 2002/09/16 00:53:12 krw Exp $ */ -/* $NetBSD: siop_common.c,v 1.30 2002/08/29 18:23:52 bouyer Exp $ */ +/* $OpenBSD: siop_common.c,v 1.15 2002/10/09 23:43:11 krw Exp $ */ +/* $NetBSD: siop_common.c,v 1.31 2002/09/27 15:37:18 provos Exp $ */ /* * Copyright (c) 2000, 2002 Manuel Bouyer. @@ -134,7 +134,7 @@ siop_common_attach(sc) sc->st_minsync = scf_period[i].period; } if (sc->st_maxsync == 255 || sc->st_minsync == 0) - panic("siop: can't find my sync parameters\n"); + panic("siop: can't find my sync parameters"); for (i = 0; i < sizeof(dt_scf_period) / sizeof(dt_scf_period[0]); i++) { if (sc->clock_period != dt_scf_period[i].clock) continue; @@ -144,7 +144,7 @@ siop_common_attach(sc) sc->dt_minsync = dt_scf_period[i].period; } if (sc->dt_maxsync == 255 || sc->dt_minsync == 0) - panic("siop: can't find my sync parameters\n"); + panic("siop: can't find my sync parameters"); return 0; } diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c index acfdd2b04d3..58e0d0b4882 100644 --- a/sys/dev/ic/wdc.c +++ b/sys/dev/ic/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.52 2002/07/02 15:26:19 csapuntz Exp $ */ +/* $OpenBSD: wdc.c,v 1.53 2002/10/09 23:43:11 krw Exp $ */ /* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */ @@ -910,7 +910,7 @@ wdcstart(chp) } #ifdef DIAGNOSTIC if ((chp->ch_flags & WDCF_IRQ_WAIT) != 0) - panic("wdcstart: channel waiting for irq\n"); + panic("wdcstart: channel waiting for irq"); #endif if (chp->wdc->cap & WDC_CAPABILITY_HWLOCK) if (!(chp->wdc->claim_hw)(chp, 0)) @@ -1599,7 +1599,7 @@ wdc_exec_command(drvp, wdc_c) #ifdef DIAGNOSTIC if ((wdc_c->flags & AT_POLL) != 0 && (wdc_c->flags & AT_DONE) == 0) - panic("wdc_exec_command: polled command not done\n"); + panic("wdc_exec_command: polled command not done"); #endif if (wdc_c->flags & AT_DONE) { ret = WDC_COMPLETE; |