X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmacro.h;h=19f259e4f1166c24a5acfde409cb51e17b00b284;hp=996b7c2ed141b42c4f8ce8ea3ffa4881cf1108c1;hb=b8217b7bd5fd171916a095b150fad4c3a37f5a41;hpb=bef2733fae665e880da6ea011b1f918e6900bb42

diff --git a/src/macro.h b/src/macro.h
index 996b7c2ed..19f259e4f 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -23,12 +23,11 @@
 ***/
 
 #include <assert.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <inttypes.h>
 
-#define PAGE_SIZE 4096
-
 #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
 #define _sentinel_ __attribute__ ((sentinel))
 #define _noreturn_ __attribute__((noreturn))
@@ -51,12 +50,9 @@
 #define STRINGIFY(x) XSTRINGIFY(x)
 
 /* Rounds up */
-static inline size_t ALIGN(size_t l) {
-        return ((l + sizeof(void*) - 1) & ~(sizeof(void*) - 1));
-}
-
-static inline size_t PAGE_ALIGN(size_t l) {
-        return ((l + PAGE_SIZE - 1) & ~(PAGE_SIZE -1));
+#define ALIGN(l) ALIGN_TO((l), sizeof(void*))
+static inline size_t ALIGN_TO(size_t l, size_t ali) {
+        return ((l + ali - 1) & ~(ali - 1));
 }
 
 #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
@@ -96,9 +92,7 @@ static inline size_t PAGE_ALIGN(size_t l) {
 #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. */
@@ -111,9 +105,7 @@ static inline size_t PAGE_ALIGN(size_t l) {
 
 #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)                            \
@@ -154,7 +146,7 @@ static inline size_t PAGE_ALIGN(size_t l) {
                 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;