diff options
| author | Justus Winter <[email protected]> | 2017-01-10 11:31:46 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-01-10 11:31:46 +0000 |
| commit | bfd6a490129ffc7c7ac8776bf5a5da3b1ddf6d42 (patch) | |
| tree | 307d158b3d75fa0e909d5828aa9e942cabed835b | |
| parent | dirmngr: Use "pgpkey-hkps" and "pgpkey-hkp" for SRV record lookups. (diff) | |
| download | gnupg-bfd6a490129ffc7c7ac8776bf5a5da3b1ddf6d42.tar.gz gnupg-bfd6a490129ffc7c7ac8776bf5a5da3b1ddf6d42.zip | |
common: Fix fallback code.
* common/logging.c (_log_assert): Fix the variant for compilers that
do not support __FUNCTION__.
* common/logging.h (_log_assert): Likewise.
Signed-off-by: Justus Winter <[email protected]>
| -rw-r--r-- | common/logging.c | 2 | ||||
| -rw-r--r-- | common/logging.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/logging.c b/common/logging.c index ca1341c20..c06a34f38 100644 --- a/common/logging.c +++ b/common/logging.c @@ -1007,7 +1007,7 @@ void _log_assert (const char *expr, const char *file, int line) { log_log (GPGRT_LOG_BUG, "Assertion \"%s\" failed (%s:%d)\n", - file, line, func); + expr, file, line); abort (); /* Never called; just to make the compiler happy. */ } #endif /*!GPGRT_HAVE_MACRO_FUNCTION*/ diff --git a/common/logging.h b/common/logging.h index fc9e8461b..8edc5c9c7 100644 --- a/common/logging.h +++ b/common/logging.h @@ -62,7 +62,7 @@ estream_t log_get_stream (void); : _log_assert (#expr, __FILE__, __LINE__, __FUNCTION__)) #else /*!GPGRT_HAVE_MACRO_FUNCTION*/ void bug_at (const char *file, int line); - void _log_assert (const char *expr, const char *file, int line; + void _log_assert (const char *expr, const char *file, int line); # define BUG() bug_at( __FILE__ , __LINE__ ) # define log_assert(expr) \ ((expr) \ |