X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmacro.h;h=58de001f262301dc705507b0cae00ad561e24304;hb=cc26086ff45bf3c35978ce0d6a49349230b36183;hp=e7a4d2cde1940e531b113a0231a52c517bbf006d;hpb=37f85e66e8f396b6f758e063531b95531aef628e;p=elogind.git

diff --git a/src/macro.h b/src/macro.h
index e7a4d2cde..58de001f2 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -91,9 +91,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 +104,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)                            \
@@ -149,7 +145,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
                 char *_s = (char *)(s);         \
                 _i->iov_base = _s;              \
                 _i->iov_len = strlen(_s);       \
-        } while(false);
+        } while(false)
 
 static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n) {
         unsigned j;