b7d534200
Bernhard Reutner-Fischer
2005-12-12
Subject
- fix zcip for IMA compile mode. rename usage() to zcip_usage, make struct arp_packet static. This applet is not ISO C89 compatible due to the use of C99-style comments ("c++ comments).
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/zcip.c+6 -6
| @@ -65,7 +65,7 @@ | |
| #include <linux/sockios.h> | |
| - | struct arp_packet { |
| + | static struct arp_packet { |
| struct ether_header hdr; | |
| // FIXME this part is netinet/if_ether.h "struct ether_arp" | |
| struct arphdr arp; | |
| @@ -214,8 +214,8 @@ bad: | |
| /** | |
| * Print usage information. | |
| */ | |
| - | static void __attribute__ ((noreturn)) |
| - | usage(const char *msg) |
| + | static void __attribute__((noreturn)) |
| + | zcip_usage(const char *msg) |
| { | |
| fprintf(stderr, "%s: %s\n", prog, msg); | |
| #ifdef NO_BUSYBOX | |
| @@ -284,7 +284,7 @@ int zcip_main(int argc, char *argv[]) | |
| if (inet_aton(optarg, &ip) == 0 | |
| || (ntohl(ip.s_addr) & IN_CLASSB_NET) | |
| != LINKLOCAL_ADDR) { | |
| - | usage("invalid link address"); |
| + | zcip_usage("invalid link address"); |
| } | |
| continue; | |
| case 'v': | |
| @@ -294,7 +294,7 @@ int zcip_main(int argc, char *argv[]) | |
| foreground = 1; | |
| continue; | |
| default: | |
| - | usage("bad option"); |
| + | zcip_usage("bad option"); |
| } | |
| } | |
| if (optind < argc - 1) { | |
| @@ -303,7 +303,7 @@ int zcip_main(int argc, char *argv[]) | |
| script = argv[optind++]; | |
| } | |
| if (optind != argc || !intf) | |
| - | usage("wrong number of arguments"); |
| + | zcip_usage("wrong number of arguments"); |
| openlog(prog, 0, LOG_DAEMON); | |
| // initialize the interface (modprobe, ifup, etc) | |