diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2002-04-17 16:00:35 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2002-04-17 16:00:35 +0000 |
| commit | f7ebc7e6e576ca7f1958c73c9eaf818fe5f6b3ff (patch) | |
| tree | 8322069c99327eb025b7cbc9f16155f1939ccc68 /lib | |
| parent | 5f82d294c5ae4e85adc7a0603d0cd85036d3d37a (diff) | |
Use __func__ in assert.
ok millert@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/assert.c | 12 | ||||
| -rw-r--r-- | lib/libc/shlib_version | 2 | ||||
| -rw-r--r-- | lib/libc_r/shlib_version | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c index ed0ca708aba..62f56686649 100644 --- a/lib/libc/gen/assert.c +++ b/lib/libc/gen/assert.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: assert.c,v 1.2 1996/08/19 08:21:46 tholo Exp $"; +static char *rcsid = "$OpenBSD: assert.c,v 1.3 2002/04/17 16:00:34 espie Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -51,3 +51,13 @@ __assert(file, line, failedexpr) abort(); /* NOTREACHED */ } + +void +__assert2(const char *file, int line, const char *func, const char *failedexpr) +{ + (void)fprintf(stderr, + "assertion \"%s\" failed: file \"%s\", line %d, function \"%s\"\n", + failedexpr, file, line, func); + abort(); + /* NOTREACHED */ +} diff --git a/lib/libc/shlib_version b/lib/libc/shlib_version index 51feb7c82c1..0a19050cd2f 100644 --- a/lib/libc/shlib_version +++ b/lib/libc/shlib_version @@ -1,2 +1,2 @@ major=28 -minor=3 # note: remember to update minor in ../libc_r/shlib_version +minor=4 # note: remember to update minor in ../libc_r/shlib_version diff --git a/lib/libc_r/shlib_version b/lib/libc_r/shlib_version index 1c51894bdac..dd2e39acd75 100644 --- a/lib/libc_r/shlib_version +++ b/lib/libc_r/shlib_version @@ -1,2 +1,2 @@ major=6 -minor=3 +minor=4 |