diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-07 12:51:11 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-07 12:51:11 +0000 |
commit | 7e3d90a64c293c5a7a722cf739fb36461f13ff0f (patch) | |
tree | 46d1352223f1d14ea4aa6d741953e2606c59ac34 /usr/src/boot/lib/libstand/assert.c | |
parent | b4bede175d4c50ac1b36078a677b69388f6fb59f (diff) | |
parent | 96cf04672307d7aacdfa73ae214d34affe5a218b (diff) | |
download | illumos-joyent-7e3d90a64c293c5a7a722cf739fb36461f13ff0f.tar.gz |
[illumos-gate merge]
commit 96cf04672307d7aacdfa73ae214d34affe5a218b
10454 loader: panic does add newline for us
commit 3c30f56df862431210f98c7c8f13cf1362b9c574
10471 ld(1) amd64 LD->LE TLS transition causes memory corruption
commit 4db555a5389470c6f15aa8b50a38ca5d533d0641
10367 ld(1) tests should be a real test suite
10368 want an ld(1) regression test for i386 LD tls transition (10267)
Diffstat (limited to 'usr/src/boot/lib/libstand/assert.c')
-rw-r--r-- | usr/src/boot/lib/libstand/assert.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/boot/lib/libstand/assert.c b/usr/src/boot/lib/libstand/assert.c index bfc1933dea..7ed70d70ee 100644 --- a/usr/src/boot/lib/libstand/assert.c +++ b/usr/src/boot/lib/libstand/assert.c @@ -34,10 +34,9 @@ void __assert(const char *func, const char *file, int line, const char *expression) { if (func == NULL) - panic("Assertion failed: (%s), file %s, line %d.\n", + panic("Assertion failed: (%s), file %s, line %d.", expression, file, line); else - panic( - "Assertion failed: (%s), function %s, file %s, line %d.\n", + panic("Assertion failed: (%s), function %s, file %s, line %d.", expression, func, file, line); } |