[PATCH] usage: conditionally compile unleak_memory() definition
- From
Ramsay Jones <ramsay@ramsayjones.plus.com>
- Date
- Sep 7, 2017, 16:08 UTC
- Message-ID
- <1cf112f5-aad1-e1c6-b507-9524f4b72fec@ramsayjones.plus.com>
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> ---
Hi Jeff,
If you need to re-roll your 'jk/leak-checkers' branch, could you please squash this into the relevant patch (commit c57586d954, "add UNLEAK annotation for reducing leak false positives", 05-09-2017).
This was noticed by sparse, since it is not declared when the SUPPRESS_ANNOTATED_LEAKS pre-processor macro is not defined. (You could move the declaration out of the #ifdef in the header file, I suppose, but it seems pointless to compile the function if it isn't being used).
Thanks!
ATB, Ramsay Jones
usage.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/usage.c b/usage.c index 780ed73be..cdd534c9d 100644 --- a/usage.c +++ b/usage.c @@ -242,6 +242,7 @@ NORETURN void BUG(const char *fmt, ...) } #endif +#ifdef SUPPRESS_ANNOTATED_LEAKS void unleak_memory(const void *ptr, size_t len) { static struct suppressed_leak_root { @@ -254,3 +255,4 @@ void unleak_memory(const void *ptr, size_t len) root->next = suppressed_leaks; suppressed_leaks = root; } +#endif
-- 2.14.0