- 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).

diff --git a/networking/zcip.c b/networking/zcip.c
index 5436cb5dab8b1d6cf2c68545dd66ad7b556e1d49..07bb7fb79186fda404e8635d3cd4a7cd5773324e 100644 (file)
--- 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)