lots of silly indent fixes

This commit is contained in:
Denis Vlasenko
2006-10-03 19:56:34 +00:00
parent cf94446af7
commit 9275814a9e
12 changed files with 143 additions and 144 deletions

View File

@@ -325,20 +325,20 @@ static int scan_ip_mask(const char *ipm, unsigned int *ip, unsigned int *mask)
i = 0;
while (*p) {
if (*p < '0' || *p > '9') {
if (*p == '.') {
i = scan_ip(&ipm, mask, 0);
return i != 32;
}
return -1;
if (*p < '0' || *p > '9') {
if (*p == '.') {
i = scan_ip(&ipm, mask, 0);
return i != 32;
}
i *= 10;
i += *p - '0';
p++;
return -1;
}
i *= 10;
i += *p - '0';
p++;
}
}
if (i > 32 || i < 0)
return -1;
return -1;
msk = 0x80000000;
*mask = 0;
while (i > 0) {
@@ -553,7 +553,7 @@ static void parse_conf(const char *path, int flag)
} else if ((cf[1] == '.') && (cf[2] == '/' || cf[2] == 0)) {
++cf;
if (p > p0) {
while (*--p != '/'); /* omit previous dir */
while (*--p != '/') /* omit previous dir */;
}
continue;
}
@@ -1571,8 +1571,8 @@ BAD_REQUEST:
/* protect out root */
goto BAD_REQUEST;
}
while (*--purl != '/'); /* omit previous dir */
continue;
while (*--purl != '/') /* omit previous dir */;
continue;
}
}
}

View File

@@ -48,8 +48,8 @@ void ip_parse_common_args(int *argcp, char ***argvp)
if (matches(opt, "-family") == 0) {
argc--;
argv++;
if (! argv[1])
bb_show_usage();
if (!argv[1])
bb_show_usage();
if (strcmp(argv[1], "inet") == 0)
preferred_family = AF_INET;
else if (strcmp(argv[1], "inet6") == 0)

View File

@@ -205,12 +205,12 @@ static void handlenetoutput(int len)
}
outbuf[j++] = *p;
if (*p == 0xff)
outbuf[j++] = 0xff;
outbuf[j++] = 0xff;
else if (*p == 0x0d)
outbuf[j++] = 0x00;
outbuf[j++] = 0x00;
}
if (j > 0 )
write(G.netfd, outbuf, j);
write(G.netfd, outbuf, j);
}

View File

@@ -641,7 +641,7 @@ send_probe(int seq, int ttl, struct timeval *tp)
outicmp->icmp_cksum = 0xffff;
} else
#endif
if (doipcksum) {
if (doipcksum) {
/* Checksum (we must save and restore ip header) */
tip = *outip;
ui = (struct udpiphdr *)outip;
@@ -788,7 +788,7 @@ packet_ok(unsigned char *buf, int cc, struct sockaddr_in *from, int seq)
return (type == ICMP_TIMXCEED ? -1 : code + 1);
} else
#endif
{
{
up = (struct udphdr *)((unsigned char *)hip + hlen);
/* XXX 8 is a magic number */
if (hlen + 12 <= cc &&
@@ -996,11 +996,11 @@ traceroute_main(int argc, char *argv[])
if(nprobes_str)
nprobes = str2val(nprobes_str, "nprobes", 1, -1);
if(source) {
/*
* set the ip source address of the outbound
* probe (e.g., on a multi-homed host).
*/
if (getuid()) bb_error_msg_and_die("-s %s: Permission denied", source);
/*
* set the ip source address of the outbound
* probe (e.g., on a multi-homed host).
*/
if (getuid()) bb_error_msg_and_die("-s %s: permission denied", source);
}
if(waittime_str)
waittime = str2val(waittime_str, "wait time", 2, 24 * 60 * 60);
@@ -1015,7 +1015,7 @@ traceroute_main(int argc, char *argv[])
for(l_sr = sourse_route_list; l_sr; ) {
if (lsrr >= NGATEWAYS)
bb_error_msg_and_die("No more than %d gateways", NGATEWAYS);
bb_error_msg_and_die("no more than %d gateways", NGATEWAYS);
getaddr(gwlist + lsrr, l_sr->data);
++lsrr;
l_sr = l_sr->link;