From fb6d0f9006b887a8c796f8c2ea56592e837cffa6 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 27 Nov 2015 18:02:08 +0800 Subject: [PATCH] ipaddr_aton: Avoid duplicate code to handle IPv4 address string conversion Signed-off-by: Axel Lin --- src/core/ipv6/ip6_addr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/ipv6/ip6_addr.c b/src/core/ipv6/ip6_addr.c index e157b1e7..a6aba11e 100644 --- a/src/core/ipv6/ip6_addr.c +++ b/src/core/ipv6/ip6_addr.c @@ -311,13 +311,10 @@ ipaddr_aton(const char *cp, ip_addr_t *addr) return ip6addr_aton(cp, ip_2_ip6(addr)); } else if (*c == '.') { /* contains a dot: IPv4 address */ - if (addr) { - IP_SET_TYPE_VAL(*addr, IPADDR_TYPE_V4); - } - return ip4addr_aton(cp, ip_2_ip4(addr)); + break; } } - /* nothing found, call ip4addr_aton as fallback */ + /* call ip4addr_aton as fallback or if IPv4 was found */ if (addr) { IP_SET_TYPE_VAL(*addr, IPADDR_TYPE_V4); }