emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

silly size savings and capitalization fixes

Browse Source
This commit is contained in:
Denis Vlasenko
2006-10-26 00:37:00 +00:00
parent e63a0dee9e
commit c6f188def8
24 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
networking/libiproute/iptunnel.c
View File

@@ -164,26 +164,26 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
if (strcmp(*argv, "ipip") == 0 ||
strcmp(*argv, "ip/ip") == 0) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
bb_error_msg("You managed to ask for more than one tunnel mode.");
bb_error_msg("you managed to ask for more than one tunnel mode");
exit(-1);
}
p->iph.protocol = IPPROTO_IPIP;
} else if (strcmp(*argv, "gre") == 0 ||
strcmp(*argv, "gre/ip") == 0) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
bb_error_msg("You managed to ask for more than one tunnel mode.");
bb_error_msg("you managed to ask for more than one tunnel mode");
exit(-1);
}
p->iph.protocol = IPPROTO_GRE;
} else if (strcmp(*argv, "sit") == 0 ||
strcmp(*argv, "ipv6/ip") == 0) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
bb_error_msg("You managed to ask for more than one tunnel mode.");
bb_error_msg("you managed to ask for more than one tunnel mode");
exit(-1);
}
p->iph.protocol = IPPROTO_IPV6;
} else {
bb_error_msg("Cannot guess tunnel mode.");
bb_error_msg("cannot guess tunnel mode");
exit(-1);
}
} else if (strcmp(*argv, "key") == 0) {
@@ -306,7 +306,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
bb_error_msg("Keys are not allowed with ipip and sit.");
bb_error_msg("keys are not allowed with ipip and sit");
return -1;
}
}
@@ -326,7 +326,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
p->o_flags |= GRE_KEY;
}
if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) {
bb_error_msg("Broadcast tunnel requires a source address.");
bb_error_msg("broadcast tunnel requires a source address");
return -1;
}
return 0;
@@ -462,7 +462,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
buf[sizeof(buf) - 1] = 0;
if ((ptr = strchr(buf, ':')) == NULL ||
(*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
bb_error_msg("Wrong format of /proc/net/dev. Sorry.");
bb_error_msg("wrong format of /proc/net/dev. Sorry");
return -1;
}
if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
@@ -475,7 +475,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
continue;
type = do_ioctl_get_iftype(name);
if (type == -1) {
bb_error_msg("Failed to get type of [%s]", name);
bb_error_msg("failed to get type of [%s]", name);
continue;
}
if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT)
@@ -490,7 +490,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
(p->i_key && p1.i_key != p->i_key))
continue;
print_tunnel(&p1);
printf("\n");
puts("");
}
return 0;
}
@@ -521,7 +521,7 @@ static int do_show(int argc, char **argv)
return -1;
print_tunnel(&p);
printf("\n");
puts("");
return 0;
}
@@ -541,6 +541,6 @@ int do_iptunnel(int argc, char **argv)
} else
return do_show(0, NULL);
bb_error_msg("Command \"%s\" is unknown.", *argv);
bb_error_msg("command \"%s\" is unknown", *argv);
exit(-1);
}