From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 15 Aug 2021 15:32:10 +0000 (+0900)
Subject: network: can: move function
X-Git-Tag: v250-rc1~826^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=952508abda64390b247e4eb5274a53e4a73c782b;p=thirdparty%2Fsystemd.git

network: can: move function
---

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;
+}