lib/utils: improve error messages of get_addr() and get_prefix()

Instead of statically complaining about illegal inet address, use
get_family() to get the address family right.

Based on a patch by Hangbin Liu to print "inet6" for AF_INET6 made more
generic by me.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/lib/utils.c b/lib/utils.c
index 107e3f5766d384c060947bc46bfad5bb32295dfa..939a44f0dd32849058cac27a24c3190e3f699bf7 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -531,7 +531,8 @@ done:
 int get_addr(inet_prefix *dst, const char *arg, int family)
 {
        if (get_addr_1(dst, arg, family)) {
-               fprintf(stderr, "Error: an inet address is expected rather than \"%s\".\n", arg);
+               fprintf(stderr, "Error: %s address is expected rather than \"%s\".\n",
+                               family_name(family) ,arg);
                exit(1);
        }
        return 0;
@@ -544,7 +545,8 @@ int get_prefix(inet_prefix *dst, char *arg, int family)
                exit(1);
        }
        if (get_prefix_1(dst, arg, family)) {
-               fprintf(stderr, "Error: an inet prefix is expected rather than \"%s\".\n", arg);
+               fprintf(stderr, "Error: %s prefix is expected rather than \"%s\".\n",
+                               family_name(family) ,arg);
                exit(1);
        }
        return 0;