summaryrefslogtreecommitdiffhomepage
path: root/networking
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2005-12-12 10:21:35 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2005-12-12 10:21:35 +0000
commitb7d53420033c3bbaea0127d262cfaf52eeea7745 (patch)
tree695ade23133fe0e31e1f644e5697c9b337414d72 /networking
parent10fb2b71f3bb8f1c5c1dce43824038021a79ff75 (diff)
- 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).
Diffstat (limited to 'networking')
-rw-r--r--networking/zcip.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/networking/zcip.c b/networking/zcip.c
index 5436cb5da..07bb7fb79 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -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)