From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 24 Aug 2018 07:43:01 +0000 (+0900)
Subject: libudev-monitor: use structured initializer in bpf_*()
X-Git-Tag: v240~720^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d01fa902c3804417126c2b846f671c710669ce8;p=thirdparty%2Fsystemd.git

libudev-monitor: use structured initializer in bpf_*()

This also drop inline attribute from the functions.
---

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 9b4b3067c63..f83115c95ce 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -233,26 +233,23 @@ _public_ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, c
         return udev_monitor_new_from_netlink_fd(udev, name, -1);
 }
 
-static inline void bpf_stmt(struct sock_filter *inss, unsigned *i,
-                            unsigned short code, unsigned data) {
-        struct sock_filter *ins = &inss[*i];
-
-        ins->code = code;
-        ins->k = data;
-        (*i)++;
+static void bpf_stmt(struct sock_filter *ins, unsigned *i,
+                     unsigned short code, unsigned data) {
+        ins[(*i)++] = (struct sock_filter) {
+                .code = code,
+                .k = data,
+        };
 }
 
-static inline void bpf_jmp(struct sock_filter *inss, unsigned *i,
-                           unsigned short code, unsigned data,
-                           unsigned short jt, unsigned short jf)
-{
-        struct sock_filter *ins = &inss[*i];
-
-        ins->code = code;
-        ins->jt = jt;
-        ins->jf = jf;
-        ins->k = data;
-        (*i)++;
+static void bpf_jmp(struct sock_filter *ins, unsigned *i,
+                    unsigned short code, unsigned data,
+                    unsigned short jt, unsigned short jf) {
+        ins[(*i)++] = (struct sock_filter) {
+                .code = code,
+                .jt = jt,
+                .jf = jf,
+                .k = data,
+        };
 }
 
 /**