svn commit: trunk/busybox/networking/libiproute
aldot at busybox.net
aldot at busybox.net
Thu Oct 30 17:42:50 UTC 2008
Author: aldot
Date: 2008-10-30 10:42:49 -0700 (Thu, 30 Oct 2008)
New Revision: 23864
Log:
- minor shrinkage (~-60)
Modified:
trunk/busybox/networking/libiproute/iptunnel.c
Changeset:
Modified: trunk/busybox/networking/libiproute/iptunnel.c
===================================================================
--- trunk/busybox/networking/libiproute/iptunnel.c 2008-10-30 17:21:18 UTC (rev 23863)
+++ trunk/busybox/networking/libiproute/iptunnel.c 2008-10-30 17:42:49 UTC (rev 23864)
@@ -165,23 +165,23 @@
if (key == ARG_ipip ||
key == ARG_ip_ip) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
- bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
+ bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
}
p->iph.protocol = IPPROTO_IPIP;
} else if (key == ARG_gre ||
key == ARG_gre_ip) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
- bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
+ bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
}
p->iph.protocol = IPPROTO_GRE;
} else if (key == ARG_sit ||
key == ARG_ip6_ip) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
- bb_error_msg_and_die("you managed to ask for more than one tunnel mode");
+ bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
}
p->iph.protocol = IPPROTO_IPV6;
} else {
- bb_error_msg_and_die("cannot guess tunnel mode");
+ bb_error_msg_and_die("%s tunnel mode", "cannot guess");
}
} else if (key == ARG_key) {
unsigned uval;
@@ -192,7 +192,7 @@
p->i_key = p->o_key = get_addr32(*argv);
else {
if (get_unsigned(&uval, *argv, 0) < 0) {
- bb_error_msg_and_die("invalid value of \"key\"");
+ invarg(*argv, "key");
}
p->i_key = p->o_key = htonl(uval);
}
@@ -204,7 +204,7 @@
p->o_key = get_addr32(*argv);
else {
if (get_unsigned(&uval, *argv, 0) < 0) {
- bb_error_msg_and_die("invalid value of \"ikey\"");
+ invarg(*argv, "ikey");
}
p->i_key = htonl(uval);
}
@@ -216,7 +216,7 @@
p->o_key = get_addr32(*argv);
else {
if (get_unsigned(&uval, *argv, 0) < 0) {
- bb_error_msg_and_die("invalid value of \"okey\"");
+ invarg(*argv, "okey");
}
p->o_key = htonl(uval);
}
@@ -442,7 +442,7 @@
if (fp == NULL) {
return;
}
-
+ /* skip headers */
fgets(buf, sizeof(buf), fp);
fgets(buf, sizeof(buf), fp);
More information about the busybox-cvs
mailing list