From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 15 Aug 2025 04:51:25 +0000 (+0900)
Subject: assert-util: drop message argument of assert_log()
X-Git-Tag: v258-rc3~33^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bfcc81c322ae2371c2cc1591a4ef3406fd54737;p=thirdparty%2Fsystemd.git

assert-util: drop message argument of assert_log()

As it is always equals to #expr.
---

diff --git a/src/basic/assert-util.h b/src/basic/assert-util.h
index f6bb7702ea6..beb52ba8849 100644
--- a/src/basic/assert-util.h
+++ b/src/basic/assert-util.h
@@ -10,19 +10,20 @@ bool log_get_assert_return_is_critical(void) _pure_;
 
 void log_assert_failed_return(const char *text, const char *file, int line, const char *func);
 
-#define assert_log(expr, message) ((_likely_(expr))                     \
-        ? (true)                                                        \
-        : (log_assert_failed_return(message, PROJECT_FILE, __LINE__, __func__), false))
+#define assert_log(expr)                                                \
+        (_likely_(expr) ?                                               \
+         true :                                                         \
+         (log_assert_failed_return(#expr, PROJECT_FILE, __LINE__, __func__), false))
 
 #define assert_return(expr, r)                                          \
         do {                                                            \
-                if (!assert_log(expr, #expr))                           \
+                if (!assert_log(expr))                                  \
                         return (r);                                     \
         } while (false)
 
 #define assert_return_errno(expr, r, err)                               \
         do {                                                            \
-                if (!assert_log(expr, #expr)) {                         \
+                if (!assert_log(expr)) {                                \
                         errno = err;                                    \
                         return (r);                                     \
                 }                                                       \
diff --git a/src/fundamental/assert-fundamental.h b/src/fundamental/assert-fundamental.h
index 0b5c7f21de9..3168e5699aa 100644
--- a/src/fundamental/assert-fundamental.h
+++ b/src/fundamental/assert-fundamental.h
@@ -50,7 +50,7 @@ static inline int __coverity_check_and_return__(int condition) {
 
 #define assert_message_se(expr, message) __coverity_check__(!!(expr))
 
-#define assert_log(expr, message) __coverity_check_and_return__(!!(expr))
+#define assert_log(expr) __coverity_check_and_return__(!!(expr))
 
 #else  /* ! __COVERITY__ */
 
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 0a0dd4143b3..e8145622de8 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -399,7 +399,7 @@ int bus_maybe_reply_error(sd_bus_message *m, int r, const sd_bus_error *e);
 
 #define bus_assert_return(expr, r, error)                               \
         do {                                                            \
-                if (!assert_log(expr, #expr))                           \
+                if (!assert_log(expr))                                  \
                         return sd_bus_error_set_errno(error, r);        \
         } while (false)