From 4cfd024e73949d9b6ab5c865ed407a876a9bd49b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 24 May 2025 20:44:12 +0200 Subject: [PATCH 1/2] forward: Move ChaseFlags forward declaration to forward.h --- src/basic/forward.h | 1 + src/libsystemd/sd-device/device-private.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/basic/forward.h b/src/basic/forward.h index 2c96c857fc..3077403528 100644 --- a/src/basic/forward.h +++ b/src/basic/forward.h @@ -83,6 +83,7 @@ union sockaddr_union; typedef enum CGroupFlags CGroupFlags; typedef enum CGroupMask CGroupMask; +typedef enum ChaseFlags ChaseFlags; typedef enum ExtractFlags ExtractFlags; typedef enum ImageClass ImageClass; typedef enum JobMode JobMode; diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h index b5a24dde1c..d80e795154 100644 --- a/src/libsystemd/sd-device/device-private.h +++ b/src/libsystemd/sd-device/device-private.h @@ -5,8 +5,6 @@ #include "forward.h" -typedef enum ChaseFlags ChaseFlags; - int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum); int device_new_from_nulstr(sd_device **ret, char *nulstr, size_t len); int device_new_from_strv(sd_device **ret, char **strv); From a6f4a9c07bdcac48ee85243337804a553430929f Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 24 May 2025 20:44:32 +0200 Subject: [PATCH 2/2] netlink-internal: Make message_get_serial() static inline again There was no need to move this function to the implementation file, so let's make it static inline again. Follow up for #37591. --- src/libsystemd/sd-netlink/netlink-internal.h | 5 ++++- src/libsystemd/sd-netlink/netlink-message.c | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/sd-netlink/netlink-internal.h index 625b73263a..479bb07ffb 100644 --- a/src/libsystemd/sd-netlink/netlink-internal.h +++ b/src/libsystemd/sd-netlink/netlink-internal.h @@ -135,7 +135,10 @@ int message_new_full( int message_new(sd_netlink *nl, sd_netlink_message **ret, uint16_t type, uint16_t flags); int message_new_synthetic_error(sd_netlink *nl, int error, uint32_t serial, sd_netlink_message **ret); -uint32_t message_get_serial(sd_netlink_message *m); +static inline uint32_t message_get_serial(sd_netlink_message *m) { + assert(m); + return ASSERT_PTR(m->hdr)->nlmsg_seq; +} void message_seal(sd_netlink_message *m); diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c index e55b0f0da5..89d045fae9 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/sd-netlink/netlink-message.c @@ -111,11 +111,6 @@ int message_new_synthetic_error(sd_netlink *nl, int error, uint32_t serial, sd_n return 0; } -uint32_t message_get_serial(sd_netlink_message *m) { - assert(m); - return ASSERT_PTR(m->hdr)->nlmsg_seq; -} - int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) { assert_return(m, -EINVAL); assert_return(m->hdr, -EINVAL);