diff options
| author | jhb <jhb@FreeBSD.org> | 2004-01-15 18:35:32 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2004-01-15 18:35:32 +0000 |
| commit | 4446d36fa6d21ad7e02e09e8bf72dff316f35e7c (patch) | |
| tree | db2c02b984ba3cd846268f5baac168ac28e1413f | |
| parent | 5b3c50c69d140a1c00848f8c9f6825247529758e (diff) | |
| download | FreeBSD-src-4446d36fa6d21ad7e02e09e8bf72dff316f35e7c.zip FreeBSD-src-4446d36fa6d21ad7e02e09e8bf72dff316f35e7c.tar.gz | |
- Print out line number in a panic message using %d rather than %p. Line
numbers aren't pointers.
- Add a __printflike() attribute to libstand's panic() prototype to catch
such bogons in the future.
| -rw-r--r-- | lib/libstand/stand.h | 2 | ||||
| -rw-r--r-- | lib/libstand/zalloc_malloc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h index bf4ed28..219b2df 100644 --- a/lib/libstand/stand.h +++ b/lib/libstand/stand.h @@ -369,7 +369,7 @@ extern int ischar(void); extern void putchar(int); extern int devopen(struct open_file *, const char *, const char **); extern int devclose(struct open_file *f); -extern void panic(const char *, ...) __dead2; +extern void panic(const char *, ...) __dead2 __printflike(1, 2); extern struct fs_ops *file_system[]; extern struct devsw *devsw[]; diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c index cd89d05..fcc54dc 100644 --- a/lib/libstand/zalloc_malloc.c +++ b/lib/libstand/zalloc_malloc.c @@ -109,7 +109,7 @@ Free(void *ptr, const char *file, int line) return; } if (res->ga_Magic != GAMAGIC) - panic("free: guard1 fail @ %p from %s:%p", ptr, file, line); + panic("free: guard1 fail @ %p from %s:%d", ptr, file, line); res->ga_Magic = GAFREE; #endif #ifdef USEENDGUARD |
