diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-05-15 22:05:47 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-05-15 22:05:47 +0000 |
commit | 5168282ba1030064777679caaca672787e743975 (patch) | |
tree | 15393f4e2dffa9a3089f997f959ad956f2d3e4af /include/asterisk/utils.h | |
parent | f97d547aba49d353f35f96f235f6c0cc3a9879f9 (diff) |
Add an extra check in ast_strlen_zero, and make ast_assert() not print the
file, line, and function name twice.
(Closes issue #12650)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@116694 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/utils.h')
-rw-r--r-- | include/asterisk/utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 0de0727a7..4989b6d88 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -662,8 +662,8 @@ static void force_inline _ast_assert(int condition, const char *condition_str, if (__builtin_expect(!condition, 1)) { /* Attempt to put it into the logger, but hope that at least someone saw the * message on stderr ... */ - ast_log(LOG_ERROR, "FRACK!, Failed assertion %s (%d) at line %d in %s of %s\n", - condition_str, condition, line, function, file); + ast_log(__LOG_ERROR, file, line, function, "FRACK!, Failed assertion %s (%d)\n", + condition_str, condition); fprintf(stderr, "FRACK!, Failed assertion %s (%d) at line %d in %s of %s\n", condition_str, condition, line, function, file); /* Give the logger a chance to get the message out, just in case we abort(), or |