Move get_float() from ip/iplink_can.c to lib/utils.c

No functional change.

Signed-off-by: Chia-Yu Chang <chia-yu.chang@nokia-bell-labs.com>

diff --git a/include/utils.h b/include/utils.h
index 9a81494dd3e3d2623d18f899ff46de7ad0c95535..9a8b80262cffd59aa2c4bb12983470551fa59a41 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -146,6 +146,7 @@ int read_prop(const char *dev, char *prop, long *value);
 int get_long(long *val, const char *arg, int base);
 int get_integer(int *val, const char *arg, int base);
 int get_unsigned(unsigned *val, const char *arg, int base);
+int get_float(float *val, const char *arg);
 int get_time_rtt(unsigned *val, const char *arg, int *raw);
 #define get_byte get_u8
 #define get_ushort get_u16

diff --git a/ip/iplink_can.c b/ip/iplink_can.c
index fcffa85210a767c99ef5d9bd18f5733cd3662fc4..9f6084e63986bd05d25a050176f4640c30596b85 100644 (file)
--- a/ip/iplink_can.c
+++ b/ip/iplink_can.c
@@ -67,20 +67,6 @@ static void usage(void)
        print_usage(stderr);
 }
 
-static int get_float(float *val, const char *arg)
-{
-       float res;
-       char *ptr;
-
-       if (!arg || !*arg)
-               return -1;
-       res = strtof(arg, &ptr);
-       if (!ptr || ptr == arg || *ptr)
-               return -1;
-       *val = res;
-       return 0;
-}
-
 static void set_ctrlmode(char *name, char *arg,
                         struct can_ctrlmode *cm, __u32 flags)
 {

diff --git a/lib/utils.c b/lib/utils.c
index 706e93c343869de8c7557c5af74967367b5c6ecb..103e4875cef8f0a9c7cdf04cfb655cdf71e0c70c 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -220,6 +220,20 @@ int get_unsigned(unsigned int *val, const char *arg, int base)
        return 0;
 }
 
+int get_float(float *val, const char *arg)
+{
+       float res;
+       char *ptr;
+
+       if (!arg || !*arg)
+               return -1;
+       res = strtof(arg, &ptr);
+       if (!ptr || ptr == arg || *ptr)
+               return -1;
+       *val = res;
+       return 0;
+}
+
 /*
  * get_time_rtt is "translated" from a similar routine "get_time" in
  * tc_util.c.  We don't use the exact same routine because tc passes