X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmacro.h;h=19f259e4f1166c24a5acfde409cb51e17b00b284;hb=e96d6be763014be75d480fde503d0b77f41194a0;hp=3f30aa78920b4dad34e554d07fd6e8a42fef7760;hpb=9b3c575ed90bb1165a192dfae2fb2330baab583c;p=elogind.git diff --git a/src/macro.h b/src/macro.h index 3f30aa789..19f259e4f 100644 --- a/src/macro.h +++ b/src/macro.h @@ -23,6 +23,7 @@ ***/ #include +#include #include #include #include @@ -91,9 +92,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { #define assert_se(expr) \ do { \ if (_unlikely_(!(expr))) \ - log_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \ - "Assertion '%s' failed at %s:%u, function %s(). Aborting.", \ - #expr , __FILE__, __LINE__, __PRETTY_FUNCTION__); \ + log_assert_failed(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); \ } while (false) \ /* We override the glibc assert() here. */ @@ -106,9 +105,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { #define assert_not_reached(t) \ do { \ - log_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \ - "Code should not be reached '%s' at %s:%u, function %s(). Aborting.", \ - t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \ + log_assert_failed_unreachable(t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \ } while (false) #define assert_cc(expr) \