diff options
| author | Pierre-Clément Tosi <ptosi@google.com> | 2023-04-14 01:23:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-14 01:23:34 +0000 |
| commit | ac3582ade0a5910eb78b4a8cc66e17e199c7aa45 (patch) | |
| tree | 6cf026b8e67faa9cddc3bb79f7362d2bbc01e6e2 | |
| parent | d8e7396d55cfd62ab7bf272453ab493c99988f35 (diff) | |
| parent | af86323264909152fb7046283d77699c13419ab7 (diff) | |
| download | avb-ac3582ade0a5910eb78b4a8cc66e17e199c7aa45.tar.gz | |
util: Refactor AVB_ENABLED_DEBUG gating am: e7a3aab1c9 am: af86323264
Original change: https://android-review.googlesource.com/c/platform/external/avb/+/2520435
Change-Id: I9123fe3db90338c58f015774375c3ba07471805c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libavb/avb_util.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/libavb/avb_util.h b/libavb/avb_util.h index b6b036e..b51cf52 100644 --- a/libavb/avb_util.h +++ b/libavb/avb_util.h @@ -49,31 +49,16 @@ extern "C" { avb_fatal("assert fail: " #expr "\n"); \ } \ } while (0) -#else -#define avb_assert(expr) -#endif /* Aborts the program if reached. * * This has no effect unless AVB_ENABLE_DEBUG is defined. */ -#ifdef AVB_ENABLE_DEBUG #define avb_assert_not_reached() \ do { \ avb_fatal("assert_not_reached()\n"); \ } while (0) -#else -#define avb_assert_not_reached() -#endif - -/* Aborts the program if |addr| is not word-aligned. - * - * This has no effect unless AVB_ENABLE_DEBUG is defined. - */ -#define avb_assert_aligned(addr) \ - avb_assert((((uintptr_t)addr) & (AVB_ALIGNMENT_SIZE - 1)) == 0) -#ifdef AVB_ENABLE_DEBUG /* Print functions, used for diagnostics. * * These have no effect unless AVB_ENABLE_DEBUG is defined. @@ -97,10 +82,19 @@ extern "C" { ##__VA_ARGS__); \ } while (0) #else +#define avb_assert(expr) +#define avb_assert_not_reached() #define avb_debug(message) #define avb_debugv(message, ...) #endif +/* Aborts the program if |addr| is not word-aligned. + * + * This has no effect unless AVB_ENABLE_DEBUG is defined. + */ +#define avb_assert_aligned(addr) \ + avb_assert((((uintptr_t)addr) & (AVB_ALIGNMENT_SIZE - 1)) == 0) + /* Prints out a message. This is typically used if a runtime-error * occurs. */ |