From 1a0e5ca2f3835c954d5d800b9fc771160335ce53 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 25 May 2021 17:04:11 +0900 Subject: [PATCH] network: rebreak arguments --- src/network/networkd-bridge-vlan.c | 53 +++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/src/network/networkd-bridge-vlan.c b/src/network/networkd-bridge-vlan.c index 613c7b26804..797c5c69d55 100644 --- a/src/network/networkd-bridge-vlan.c +++ b/src/network/networkd-bridge-vlan.c @@ -206,11 +206,18 @@ int link_set_bridge_vlan(Link *link) { return 0; } -int config_parse_brvlan_pvid(const char *unit, const char *filename, - unsigned line, const char *section, - unsigned section_line, const char *lvalue, - int ltype, const char *rvalue, void *data, - void *userdata) { +int config_parse_brvlan_pvid( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Network *network = userdata; uint16_t pvid; int r; @@ -225,11 +232,18 @@ int config_parse_brvlan_pvid(const char *unit, const char *filename, return 0; } -int config_parse_brvlan_vlan(const char *unit, const char *filename, - unsigned line, const char *section, - unsigned section_line, const char *lvalue, - int ltype, const char *rvalue, void *data, - void *userdata) { +int config_parse_brvlan_vlan( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Network *network = userdata; uint16_t vid, vid_end; int r; @@ -253,14 +267,21 @@ int config_parse_brvlan_vlan(const char *unit, const char *filename, return 0; } -int config_parse_brvlan_untagged(const char *unit, const char *filename, - unsigned line, const char *section, - unsigned section_line, const char *lvalue, - int ltype, const char *rvalue, void *data, - void *userdata) { +int config_parse_brvlan_untagged( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Network *network = userdata; - int r; uint16_t vid, vid_end; + int r; assert(filename); assert(section); -- 2.47.3