diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-08-24 16:43:01 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-09-11 12:45:21 +0900 |
commit | 3d01fa902c3804417126c2b846f671c710669ce8 (patch) | |
tree | 6c9ca42ab63e442adf962851e6c363ef401b9e7a /src/libudev/libudev-monitor.c | |
parent | 7f79720711111de37427aa02c0c29e6823cc882b (diff) | |
download | systemd-3d01fa902c3804417126c2b846f671c710669ce8.tar.gz |
libudev-monitor: use structured initializer in bpf_*()
This also drop inline attribute from the functions.
Diffstat (limited to 'src/libudev/libudev-monitor.c')
-rw-r--r-- | src/libudev/libudev-monitor.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index 9b4b3067c6..f83115c95c 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, + }; } /** |