From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 20 Sep 2021 19:42:37 +0000 (+0900)
Subject: sd-netlink: add type safe macro for sd_genl_add_match()
X-Git-Tag: v250-rc1~599^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbc35fe3aa3e3e0df4c8e0ad01e6e0b44e6b8127;p=thirdparty%2Fsystemd.git

sd-netlink: add type safe macro for sd_genl_add_match()
---

diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h
index 5208dd94e40..13b284ee649 100644
--- a/src/libsystemd/sd-netlink/netlink-util.h
+++ b/src/libsystemd/sd-netlink/netlink-util.h
@@ -116,6 +116,16 @@ int rtnl_log_create_error(int r);
                                      userdata, description);            \
         })
 
+#define genl_add_match(nl, ret_slot, family, group, cmd, callback, destroy_callback, userdata, description) \
+        ({                                                              \
+                int (*_callback_)(sd_netlink *, sd_netlink_message *, typeof(userdata)) = callback; \
+                void (*_destroy_)(typeof(userdata)) = destroy_callback; \
+                sd_genl_add_match(nl, ret_slot, family, group, cmd,     \
+                                  (sd_netlink_message_handler_t) _callback_, \
+                                  (sd_netlink_destroy_t) _destroy_,     \
+                                  userdata, description);               \
+        })
+
 int netlink_message_append_hw_addr(sd_netlink_message *m, unsigned short type, const struct hw_addr_data *data);
 int netlink_message_append_in_addr_union(sd_netlink_message *m, unsigned short type, int family, const union in_addr_union *data);
 int netlink_message_append_sockaddr_union(sd_netlink_message *m, unsigned short type, const union sockaddr_union *data);