mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Silence compiler warnings

Browse source
This commit is contained in:
rl1987 2019-03-05 17:02:03 +02:00 • committed by Nick Mathewson
parent b6813845cf
commit f66a17444e
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib/log/util_bug.c
View file

@ -69,6 +69,7 @@ tor_set_failed_assertion_callback(void (*fn)(void))
/** Helper for tor_assert: report the assertion failure. */ /** Helper for tor_assert: report the assertion failure. */
void void
CHECK_PRINTF(5, 6)
tor_assertion_failed_(const char *fname, unsigned int line, tor_assertion_failed_(const char *fname, unsigned int line,
const char *func, const char *expr, const char *func, const char *expr,
const char *fmt, ...) const char *fmt, ...)
@ -77,11 +78,18 @@ tor_assertion_failed_(const char *fname, unsigned int line,
char *extra = NULL; char *extra = NULL;
va_list ap; va_list ap;
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wformat-nonliteral"
#endif
if (fmt) { if (fmt) {
va_start(ap,fmt); va_start(ap,fmt);
tor_vasprintf(&extra, fmt, ap); tor_vasprintf(&extra, fmt, ap);
va_end(ap); va_end(ap);
} }
#ifdef __clang__
#pragma clang diagnostic pop
#endif
log_err(LD_BUG, "%s:%u: %s: Assertion %s failed; aborting.", log_err(LD_BUG, "%s:%u: %s: Assertion %s failed; aborting.",
fname, line, func, expr); fname, line, func, expr);
@ -94,6 +102,7 @@ tor_assertion_failed_(const char *fname, unsigned int line,
/** Helper for tor_assert_nonfatal: report the assertion failure. */ /** Helper for tor_assert_nonfatal: report the assertion failure. */
void void
CHECK_PRINTF(6, 7)
tor_bug_occurred_(const char *fname, unsigned int line, tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr, const char *func, const char *expr,
int once, const char *fmt, ...) int once, const char *fmt, ...)
@ -120,11 +129,18 @@ tor_bug_occurred_(const char *fname, unsigned int line,
va_list ap; va_list ap;
char *extra = NULL; char *extra = NULL;
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wformat-nonliteral"
#endif
if (fmt) { if (fmt) {
va_start(ap,fmt); va_start(ap,fmt);
tor_vasprintf(&extra, fmt, ap); tor_vasprintf(&extra, fmt, ap);
va_end(ap); va_end(ap);
} }
#ifdef __clang__
#pragma clang diagnostic pop
#endif
log_warn(LD_BUG, "%s:%u: %s: Non-fatal assertion %s failed.%s", log_warn(LD_BUG, "%s:%u: %s: Non-fatal assertion %s failed.%s",
fname, line, func, expr, once_str); fname, line, func, expr, once_str);