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/atari | |
parent | 9ee95b4b405b050512cf782b508d774f4601a6b5 (diff) |
panic prints a newline for you, don't do it in the panic string
Diffstat (limited to 'sys/arch/atari')
-rw-r--r-- | sys/arch/atari/atari/kdassert.h | 8 | ||||
-rw-r--r-- | sys/arch/atari/atari/pmap.c | 2 | ||||
-rw-r--r-- | sys/arch/atari/dev/dma.c | 4 | ||||
-rw-r--r-- | sys/arch/atari/dev/fd.c | 2 | ||||
-rw-r--r-- | sys/arch/atari/dev/grfabs_fal.c | 2 | ||||
-rw-r--r-- | sys/arch/atari/dev/grfabs_tt.c | 2 | ||||
-rw-r--r-- | sys/arch/atari/dev/ncr5380.c | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/atari/atari/kdassert.h b/sys/arch/atari/atari/kdassert.h index 2b4ac37a3b9..da29af09481 100644 --- a/sys/arch/atari/atari/kdassert.h +++ b/sys/arch/atari/atari/kdassert.h @@ -36,18 +36,18 @@ #if defined (__STDC__) #if defined (__GNUC__) #define KDASSERT(x) if (!(x)) panic ("kernel assertion:\"%s\" failed\nfile: %s\n" \ - "func: %s\nline: %d\n", #x , __FILE__, __FUNCTION__, __LINE__) + "func: %s\nline: %d", #x , __FILE__, __FUNCTION__, __LINE__) #else /* !__GNUC__ */ #define KDASSERT(x) if (!(x)) panic ("kernel assertion:\"%s\" failed\nfile: %s\n" \ - "line: %d\n", #x, __FILE__, __LINE__) + "line: %d", #x, __FILE__, __LINE__) #endif /* !__GNUC__ */ #else /* !__STDC__ */ #if defined (__GNUC__) #define KDASSERT(x) if (!(x)) panic ("kernel assertion:\"%s\" failed\nfile: %s\n" \ - "func: %s\nline: %d\n", "x", __FILE__, __FUNCTION__, __LINE__) + "func: %s\nline: %d", "x", __FILE__, __FUNCTION__, __LINE__) #else /* !__GNUC__ */ #define KDASSERT(x) if (!(x)) panic ("kernel assertion:\"%s\" failed\nfile: %s\n" \ - "line: %d\n", "x", __FILE__, __LINE__) + "line: %d", "x", __FILE__, __LINE__) #endif /* !__GNUC__ */ #endif /* !__STDC__ */ #else /* !DEBUG */ diff --git a/sys/arch/atari/atari/pmap.c b/sys/arch/atari/atari/pmap.c index 9a1ff4963ad..250fcbfae23 100644 --- a/sys/arch/atari/atari/pmap.c +++ b/sys/arch/atari/atari/pmap.c @@ -391,7 +391,7 @@ pmap_init(phys_start, phys_end) * page table map. Need to adjust pmap_size() in atari_init.c. */ if (addr != (vm_offset_t)Sysmap) - panic("pmap_init: bogons in the VM system!\n"); + panic("pmap_init: bogons in the VM system!"); #ifdef DEBUG if (pmapdebug & PDB_INIT) { printf("pmap_init: Sysseg %x, Sysmap %x, Sysptmap %x\n", diff --git a/sys/arch/atari/dev/dma.c b/sys/arch/atari/dev/dma.c index decad0ce889..e3a6e6ce0f1 100644 --- a/sys/arch/atari/dev/dma.c +++ b/sys/arch/atari/dev/dma.c @@ -118,7 +118,7 @@ int rcaller; * Create a request... */ if(dma_free.tqh_first == NULL) - panic("st_dmagrab: Too many outstanding requests\n"); + panic("st_dmagrab: Too many outstanding requests"); req = dma_free.tqh_first; TAILQ_REMOVE(&dma_free, dma_free.tqh_first, entries); req->call_func = call_func; @@ -164,7 +164,7 @@ int *lock_stat; * Some validity checks first. */ if((req = dma_active.tqh_first) == NULL) - panic("st_dmafree: empty active queue\n"); + panic("st_dmafree: empty active queue"); if(req->softc != softc) printf("Caller of st_dmafree is not lock-owner!\n"); diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c index 04b303239c2..7e11c9e14d7 100644 --- a/sys/arch/atari/dev/fd.c +++ b/sys/arch/atari/dev/fd.c @@ -702,7 +702,7 @@ int drive, head, dense; DMA->dma_drvmode = (FDC_HDSET|FDC_HDSIG); break; default: - panic("fdselect: unknown density code\n"); + panic("fdselect: unknown density code"); } if(i != selected) { sps = splhigh(); diff --git a/sys/arch/atari/dev/grfabs_fal.c b/sys/arch/atari/dev/grfabs_fal.c index 54a20c722bc..ed367a1019f 100644 --- a/sys/arch/atari/dev/grfabs_fal.c +++ b/sys/arch/atari/dev/grfabs_fal.c @@ -321,7 +321,7 @@ view_t *v; if (mode->current_view == v) { #if 0 if (v->flags & VF_DISPLAY) - panic("Cannot shutdown display\n"); /* XXX */ + panic("Cannot shutdown display"); /* XXX */ #endif mode->current_view = NULL; } diff --git a/sys/arch/atari/dev/grfabs_tt.c b/sys/arch/atari/dev/grfabs_tt.c index 65d2a871585..aeece81b853 100644 --- a/sys/arch/atari/dev/grfabs_tt.c +++ b/sys/arch/atari/dev/grfabs_tt.c @@ -145,7 +145,7 @@ view_t *v; if (mode->current_view == v) { #if 0 if (v->flags & VF_DISPLAY) - panic("Cannot shutdown display\n"); /* XXX */ + panic("Cannot shutdown display"); /* XXX */ #endif mode->current_view = NULL; } diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c index 03efb29712b..eebad00a83b 100644 --- a/sys/arch/atari/dev/ncr5380.c +++ b/sys/arch/atari/dev/ncr5380.c @@ -713,7 +713,7 @@ struct ncr_softc *sc; #else if (pdma_ready()) return; - panic("Got DMA interrupt without DMA\n"); + panic("Got DMA interrupt without DMA"); #endif } scsi_clr_ipend(); |