aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2015-10-29 17:20:56 +0100
committerStephen Hemminger <shemming@brocade.com>2015-11-03 16:28:36 -0800
commitb5bb1820e8a7666a1cab56bf8370b338647fd7a2 (patch)
tree0bacbca9663db71d38b179f2d75159395aac6ebe
parentbd5bbad45007937758ec1339f2612049ce7187d7 (diff)
downloadandroid_external_iproute2-b5bb1820e8a7666a1cab56bf8370b338647fd7a2.tar.gz
android_external_iproute2-b5bb1820e8a7666a1cab56bf8370b338647fd7a2.tar.bz2
android_external_iproute2-b5bb1820e8a7666a1cab56bf8370b338647fd7a2.zip
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>
-rw-r--r--lib/utils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/utils.c b/lib/utils.c
index 107e3f5..939a44f 100644
--- 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;