diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 19:56:34 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 19:56:34 +0000 |
commit | 9275814a9e6a3af390c932238c0b1130de8d0edd (patch) | |
tree | beabb5991332e0e2af56b4cb885a8fd6fc7daae2 /networking | |
parent | cf94446af7a75385955e0c4de2d5898b219f5719 (diff) | |
download | busybox-w32-9275814a9e6a3af390c932238c0b1130de8d0edd.tar.gz busybox-w32-9275814a9e6a3af390c932238c0b1130de8d0edd.tar.bz2 busybox-w32-9275814a9e6a3af390c932238c0b1130de8d0edd.zip |
lots of silly indent fixes
Diffstat (limited to 'networking')
-rw-r--r-- | networking/httpd.c | 26 | ||||
-rw-r--r-- | networking/libiproute/ip_parse_common_args.c | 4 | ||||
-rw-r--r-- | networking/telnet.c | 6 | ||||
-rw-r--r-- | networking/traceroute.c | 16 |
4 files changed, 26 insertions, 26 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 7388bb67e..e533594f2 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -325,20 +325,20 @@ static int scan_ip_mask(const char *ipm, unsigned int *ip, unsigned int *mask) | |||
325 | 325 | ||
326 | i = 0; | 326 | i = 0; |
327 | while (*p) { | 327 | while (*p) { |
328 | if (*p < '0' || *p > '9') { | 328 | if (*p < '0' || *p > '9') { |
329 | if (*p == '.') { | 329 | if (*p == '.') { |
330 | i = scan_ip(&ipm, mask, 0); | 330 | i = scan_ip(&ipm, mask, 0); |
331 | return i != 32; | 331 | return i != 32; |
332 | } | ||
333 | return -1; | ||
334 | } | 332 | } |
335 | i *= 10; | 333 | return -1; |
336 | i += *p - '0'; | 334 | } |
337 | p++; | 335 | i *= 10; |
336 | i += *p - '0'; | ||
337 | p++; | ||
338 | } | 338 | } |
339 | } | 339 | } |
340 | if (i > 32 || i < 0) | 340 | if (i > 32 || i < 0) |
341 | return -1; | 341 | return -1; |
342 | msk = 0x80000000; | 342 | msk = 0x80000000; |
343 | *mask = 0; | 343 | *mask = 0; |
344 | while (i > 0) { | 344 | while (i > 0) { |
@@ -553,7 +553,7 @@ static void parse_conf(const char *path, int flag) | |||
553 | } else if ((cf[1] == '.') && (cf[2] == '/' || cf[2] == 0)) { | 553 | } else if ((cf[1] == '.') && (cf[2] == '/' || cf[2] == 0)) { |
554 | ++cf; | 554 | ++cf; |
555 | if (p > p0) { | 555 | if (p > p0) { |
556 | while (*--p != '/'); /* omit previous dir */ | 556 | while (*--p != '/') /* omit previous dir */; |
557 | } | 557 | } |
558 | continue; | 558 | continue; |
559 | } | 559 | } |
@@ -1571,8 +1571,8 @@ BAD_REQUEST: | |||
1571 | /* protect out root */ | 1571 | /* protect out root */ |
1572 | goto BAD_REQUEST; | 1572 | goto BAD_REQUEST; |
1573 | } | 1573 | } |
1574 | while (*--purl != '/'); /* omit previous dir */ | 1574 | while (*--purl != '/') /* omit previous dir */; |
1575 | continue; | 1575 | continue; |
1576 | } | 1576 | } |
1577 | } | 1577 | } |
1578 | } | 1578 | } |
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index e7084fbc6..fee6e5e95 100644 --- a/networking/libiproute/ip_parse_common_args.c +++ b/networking/libiproute/ip_parse_common_args.c | |||
@@ -48,8 +48,8 @@ void ip_parse_common_args(int *argcp, char ***argvp) | |||
48 | if (matches(opt, "-family") == 0) { | 48 | if (matches(opt, "-family") == 0) { |
49 | argc--; | 49 | argc--; |
50 | argv++; | 50 | argv++; |
51 | if (! argv[1]) | 51 | if (!argv[1]) |
52 | bb_show_usage(); | 52 | bb_show_usage(); |
53 | if (strcmp(argv[1], "inet") == 0) | 53 | if (strcmp(argv[1], "inet") == 0) |
54 | preferred_family = AF_INET; | 54 | preferred_family = AF_INET; |
55 | else if (strcmp(argv[1], "inet6") == 0) | 55 | else if (strcmp(argv[1], "inet6") == 0) |
diff --git a/networking/telnet.c b/networking/telnet.c index 344fc3270..fd0f84d50 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -205,12 +205,12 @@ static void handlenetoutput(int len) | |||
205 | } | 205 | } |
206 | outbuf[j++] = *p; | 206 | outbuf[j++] = *p; |
207 | if (*p == 0xff) | 207 | if (*p == 0xff) |
208 | outbuf[j++] = 0xff; | 208 | outbuf[j++] = 0xff; |
209 | else if (*p == 0x0d) | 209 | else if (*p == 0x0d) |
210 | outbuf[j++] = 0x00; | 210 | outbuf[j++] = 0x00; |
211 | } | 211 | } |
212 | if (j > 0 ) | 212 | if (j > 0 ) |
213 | write(G.netfd, outbuf, j); | 213 | write(G.netfd, outbuf, j); |
214 | } | 214 | } |
215 | 215 | ||
216 | 216 | ||
diff --git a/networking/traceroute.c b/networking/traceroute.c index 80ce5c3ee..e7e131149 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c | |||
@@ -641,7 +641,7 @@ send_probe(int seq, int ttl, struct timeval *tp) | |||
641 | outicmp->icmp_cksum = 0xffff; | 641 | outicmp->icmp_cksum = 0xffff; |
642 | } else | 642 | } else |
643 | #endif | 643 | #endif |
644 | if (doipcksum) { | 644 | if (doipcksum) { |
645 | /* Checksum (we must save and restore ip header) */ | 645 | /* Checksum (we must save and restore ip header) */ |
646 | tip = *outip; | 646 | tip = *outip; |
647 | ui = (struct udpiphdr *)outip; | 647 | ui = (struct udpiphdr *)outip; |
@@ -788,7 +788,7 @@ packet_ok(unsigned char *buf, int cc, struct sockaddr_in *from, int seq) | |||
788 | return (type == ICMP_TIMXCEED ? -1 : code + 1); | 788 | return (type == ICMP_TIMXCEED ? -1 : code + 1); |
789 | } else | 789 | } else |
790 | #endif | 790 | #endif |
791 | { | 791 | { |
792 | up = (struct udphdr *)((unsigned char *)hip + hlen); | 792 | up = (struct udphdr *)((unsigned char *)hip + hlen); |
793 | /* XXX 8 is a magic number */ | 793 | /* XXX 8 is a magic number */ |
794 | if (hlen + 12 <= cc && | 794 | if (hlen + 12 <= cc && |
@@ -996,11 +996,11 @@ traceroute_main(int argc, char *argv[]) | |||
996 | if(nprobes_str) | 996 | if(nprobes_str) |
997 | nprobes = str2val(nprobes_str, "nprobes", 1, -1); | 997 | nprobes = str2val(nprobes_str, "nprobes", 1, -1); |
998 | if(source) { | 998 | if(source) { |
999 | /* | 999 | /* |
1000 | * set the ip source address of the outbound | 1000 | * set the ip source address of the outbound |
1001 | * probe (e.g., on a multi-homed host). | 1001 | * probe (e.g., on a multi-homed host). |
1002 | */ | 1002 | */ |
1003 | if (getuid()) bb_error_msg_and_die("-s %s: Permission denied", source); | 1003 | if (getuid()) bb_error_msg_and_die("-s %s: permission denied", source); |
1004 | } | 1004 | } |
1005 | if(waittime_str) | 1005 | if(waittime_str) |
1006 | waittime = str2val(waittime_str, "wait time", 2, 24 * 60 * 60); | 1006 | waittime = str2val(waittime_str, "wait time", 2, 24 * 60 * 60); |
@@ -1015,7 +1015,7 @@ traceroute_main(int argc, char *argv[]) | |||
1015 | 1015 | ||
1016 | for(l_sr = sourse_route_list; l_sr; ) { | 1016 | for(l_sr = sourse_route_list; l_sr; ) { |
1017 | if (lsrr >= NGATEWAYS) | 1017 | if (lsrr >= NGATEWAYS) |
1018 | bb_error_msg_and_die("No more than %d gateways", NGATEWAYS); | 1018 | bb_error_msg_and_die("no more than %d gateways", NGATEWAYS); |
1019 | getaddr(gwlist + lsrr, l_sr->data); | 1019 | getaddr(gwlist + lsrr, l_sr->data); |
1020 | ++lsrr; | 1020 | ++lsrr; |
1021 | l_sr = l_sr->link; | 1021 | l_sr = l_sr->link; |