diff options
| author | James Peach <jpeach@samba.org> | 2007-06-15 21:58:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:23 -0500 |
| commit | b1ce226af8b61ad7e3c37860a59c6715012e738b (patch) | |
| tree | 4067151ac0de549002434afb9f42e75f052c6754 /source3/include | |
| parent | aa4110e6f2432d76926198ce7a2a4adea4e1860a (diff) | |
| download | samba-b1ce226af8b61ad7e3c37860a59c6715012e738b.tar.gz samba-b1ce226af8b61ad7e3c37860a59c6715012e738b.tar.bz2 samba-b1ce226af8b61ad7e3c37860a59c6715012e738b.zip | |
r23510: Tidy calls to smb_panic by removing trailing newlines. Print the
failed expression in SMB_ASSERT.
(This used to be commit 171dc060e2a576d724eed1ca65636bdafffd7713)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb_macros.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 646c6bdce0..81d4dc0666 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -49,12 +49,13 @@ /* assert macros */ #ifdef DEVELOPER #define SMB_ASSERT(b) ( (b) ? (void)0 : \ - (DEBUG(0,("PANIC: assert failed at %s(%d)\n", \ - __FILE__, __LINE__)), smb_panic("assert failed"))) + (DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \ + __FILE__, __LINE__, #b)), smb_panic("assert failed: " #b))) #else /* redefine the assert macro for non-developer builds */ #define SMB_ASSERT(b) ( (b) ? (void)0 : \ - (DEBUG(0,("PANIC: assert failed at %s(%d)\n", __FILE__, __LINE__)))) + (DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \ + __FILE__, __LINE__, #b)))) #endif #define SMB_WARN(condition, message) \ |