diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-19 14:01:09 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-19 14:01:09 +0100 |
| commit | e292d1a800312f4e0330a519e0d980e27a7172f3 (patch) | |
| tree | ee44455c6fc5a3edbc67c44a4c94186ed1fd1ff9 | |
| parent | 78f62e9079b6ad3705bb2abb7b48b31143297e86 (diff) | |
| download | mariadb-git-e292d1a800312f4e0330a519e0d980e27a7172f3.tar.gz | |
Avoid noisy Clang 7 warning about unused variable.
Patch by Eugene Kosov.
| -rw-r--r-- | include/my_valgrind.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 5d08a271d4a..a85e610f049 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -42,7 +42,7 @@ https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */ # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0) # define MEM_CHECK_DEFINED(a,len) ((void) 0) #else -# define MEM_UNDEFINED(a,len) ((void) 0) +# define MEM_UNDEFINED(a,len) ((void) (a), (void) (len)) # define MEM_NOACCESS(a,len) ((void) 0) # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0) # define MEM_CHECK_DEFINED(a,len) ((void) 0) @@ -51,7 +51,7 @@ https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */ #ifndef DBUG_OFF #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); MEM_UNDEFINED(A, trash_tmp); memset(A, C, trash_tmp); } while (0) #else -#define TRASH_FILL(A,B,C) do { const size_t trash_tmp __attribute__((unused))= (B); MEM_UNDEFINED(A,trash_tmp); } while (0) +#define TRASH_FILL(A,B,C) do { MEM_UNDEFINED((A), (B)); } while (0) #endif #define TRASH_ALLOC(A,B) do { TRASH_FILL(A,B,0xA5); MEM_UNDEFINED(A,B); } while(0) #define TRASH_FREE(A,B) do { TRASH_FILL(A,B,0x8F); MEM_NOACCESS(A,B); } while(0) |