diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-10-30 17:42:49 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-10-30 17:42:49 +0000 |
commit | 470dc1d7e20a079e99065e7bf55d88a07066f949 (patch) | |
tree | e9bab90c231fd700397855e5ccfbd5751992d955 | |
parent | e29186687b9caa8ecafda2951d3ce8341e424e44 (diff) | |
download | busybox-w32-470dc1d7e20a079e99065e7bf55d88a07066f949.tar.gz busybox-w32-470dc1d7e20a079e99065e7bf55d88a07066f949.tar.bz2 busybox-w32-470dc1d7e20a079e99065e7bf55d88a07066f949.zip |
- minor shrinkage (~-60)
-rw-r--r-- | networking/libiproute/iptunnel.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index 752d81264..65c27f936 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c | |||
@@ -165,23 +165,23 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
165 | if (key == ARG_ipip || | 165 | if (key == ARG_ipip || |
166 | key == ARG_ip_ip) { | 166 | key == ARG_ip_ip) { |
167 | if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) { | 167 | if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) { |
168 | bb_error_msg_and_die("you managed to ask for more than one tunnel mode"); | 168 | bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one"); |
169 | } | 169 | } |
170 | p->iph.protocol = IPPROTO_IPIP; | 170 | p->iph.protocol = IPPROTO_IPIP; |
171 | } else if (key == ARG_gre || | 171 | } else if (key == ARG_gre || |
172 | key == ARG_gre_ip) { | 172 | key == ARG_gre_ip) { |
173 | if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) { | 173 | if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) { |
174 | bb_error_msg_and_die("you managed to ask for more than one tunnel mode"); | 174 | bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one"); |
175 | } | 175 | } |
176 | p->iph.protocol = IPPROTO_GRE; | 176 | p->iph.protocol = IPPROTO_GRE; |
177 | } else if (key == ARG_sit || | 177 | } else if (key == ARG_sit || |
178 | key == ARG_ip6_ip) { | 178 | key == ARG_ip6_ip) { |
179 | if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) { | 179 | if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) { |
180 | bb_error_msg_and_die("you managed to ask for more than one tunnel mode"); | 180 | bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one"); |
181 | } | 181 | } |
182 | p->iph.protocol = IPPROTO_IPV6; | 182 | p->iph.protocol = IPPROTO_IPV6; |
183 | } else { | 183 | } else { |
184 | bb_error_msg_and_die("cannot guess tunnel mode"); | 184 | bb_error_msg_and_die("%s tunnel mode", "cannot guess"); |
185 | } | 185 | } |
186 | } else if (key == ARG_key) { | 186 | } else if (key == ARG_key) { |
187 | unsigned uval; | 187 | unsigned uval; |
@@ -192,7 +192,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
192 | p->i_key = p->o_key = get_addr32(*argv); | 192 | p->i_key = p->o_key = get_addr32(*argv); |
193 | else { | 193 | else { |
194 | if (get_unsigned(&uval, *argv, 0) < 0) { | 194 | if (get_unsigned(&uval, *argv, 0) < 0) { |
195 | bb_error_msg_and_die("invalid value of \"key\""); | 195 | invarg(*argv, "key"); |
196 | } | 196 | } |
197 | p->i_key = p->o_key = htonl(uval); | 197 | p->i_key = p->o_key = htonl(uval); |
198 | } | 198 | } |
@@ -204,7 +204,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
204 | p->o_key = get_addr32(*argv); | 204 | p->o_key = get_addr32(*argv); |
205 | else { | 205 | else { |
206 | if (get_unsigned(&uval, *argv, 0) < 0) { | 206 | if (get_unsigned(&uval, *argv, 0) < 0) { |
207 | bb_error_msg_and_die("invalid value of \"ikey\""); | 207 | invarg(*argv, "ikey"); |
208 | } | 208 | } |
209 | p->i_key = htonl(uval); | 209 | p->i_key = htonl(uval); |
210 | } | 210 | } |
@@ -216,7 +216,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
216 | p->o_key = get_addr32(*argv); | 216 | p->o_key = get_addr32(*argv); |
217 | else { | 217 | else { |
218 | if (get_unsigned(&uval, *argv, 0) < 0) { | 218 | if (get_unsigned(&uval, *argv, 0) < 0) { |
219 | bb_error_msg_and_die("invalid value of \"okey\""); | 219 | invarg(*argv, "okey"); |
220 | } | 220 | } |
221 | p->o_key = htonl(uval); | 221 | p->o_key = htonl(uval); |
222 | } | 222 | } |
@@ -442,7 +442,7 @@ static void do_tunnels_list(struct ip_tunnel_parm *p) | |||
442 | if (fp == NULL) { | 442 | if (fp == NULL) { |
443 | return; | 443 | return; |
444 | } | 444 | } |
445 | 445 | /* skip headers */ | |
446 | fgets(buf, sizeof(buf), fp); | 446 | fgets(buf, sizeof(buf), fp); |
447 | fgets(buf, sizeof(buf), fp); | 447 | fgets(buf, sizeof(buf), fp); |
448 | 448 | ||