From 952508abda64390b247e4eb5274a53e4a73c782b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 16 Aug 2021 00:32:10 +0900 Subject: [PATCH] network: can: move function --- src/network/networkd-can.c | 80 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/network/networkd-can.c b/src/network/networkd-can.c index 950b4134dd6..4ff56a168b0 100644 --- a/src/network/networkd-can.c +++ b/src/network/networkd-can.c @@ -12,46 +12,6 @@ #define CAN_TERMINATION_OHM_VALUE 120 -int config_parse_can_bitrate( - 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) { - - uint32_t *br = data; - uint64_t sz; - int r; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - r = parse_size(rvalue, 1000, &sz); - if (r < 0) { - log_syntax(unit, LOG_WARNING, filename, line, r, - "Failed to parse can bitrate '%s', ignoring: %m", rvalue); - return 0; - } - - /* Linux uses __u32 for bitrates, so the value should not exceed that. */ - if (sz <= 0 || sz > UINT32_MAX) { - log_syntax(unit, LOG_WARNING, filename, line, 0, - "Bit rate out of permitted range 1...4294967295"); - return 0; - } - - *br = (uint32_t) sz; - - return 0; -} - int can_set_netlink_message(Link *link, sd_netlink_message *m) { struct can_ctrlmode cm = {}; int r; @@ -180,3 +140,43 @@ int can_set_netlink_message(Link *link, sd_netlink_message *m) { return 0; } + +int config_parse_can_bitrate( + 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) { + + uint32_t *br = data; + uint64_t sz; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + r = parse_size(rvalue, 1000, &sz); + if (r < 0) { + log_syntax(unit, LOG_WARNING, filename, line, r, + "Failed to parse can bitrate '%s', ignoring: %m", rvalue); + return 0; + } + + /* Linux uses __u32 for bitrates, so the value should not exceed that. */ + if (sz <= 0 || sz > UINT32_MAX) { + log_syntax(unit, LOG_WARNING, filename, line, 0, + "Bit rate out of permitted range 1...4294967295"); + return 0; + } + + *br = (uint32_t) sz; + + return 0; +} -- 2.47.3