Remove some defined statements

[oweals/busybox.git] / networking / netstat.c

diff --git a/networking/netstat.c b/networking/netstat.c
index 67ecc0105facb355cc1a412ceb2a643336c6666f..17a58876c37a1ceaa4912b0651ca635391262261 100644 (file)
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include "inet_common.h"
 #include "busybox.h"
-#include "pwd.h"
+#include "pwd_.h"
 
 #ifdef CONFIG_ROUTE
 extern void displayroutes(int noresolve, int netstatfmt);
@@ -131,7 +131,7 @@ static void snprint_ip_port(char *ip_port, int size, struct sockaddr *addr, int
 {
        char *port_name;
 
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        if (addr->sa_family == AF_INET6) {
                INET6_rresolve(ip_port, size, (struct sockaddr_in6 *)addr,
                                           (numeric&NETSTAT_NUMERIC) ? 0x0fff : 0);
@@ -156,7 +156,7 @@ static void tcp_do_one(int lnr, const char *line)
        const char *state_str;
        char more[512];
        int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        struct sockaddr_in6 localaddr, remaddr;
        char addr6[INET6_ADDRSTRLEN];
        struct in6_addr in6;
@@ -176,7 +176,7 @@ static void tcp_do_one(int lnr, const char *line)
                                 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
 
        if (strlen(local_addr) > 8) {
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
                sscanf(local_addr, "%08X%08X%08X%08X",
                           &in6.s6_addr32[0], &in6.s6_addr32[1],
                           &in6.s6_addr32[2], &in6.s6_addr32[3]);
@@ -200,7 +200,7 @@ static void tcp_do_one(int lnr, const char *line)
        }
 
        if (num < 10) {
-               error_msg("warning, got bogus tcp line.");
+               bb_error_msg("warning, got bogus tcp line.");
                return;
        }
        state_str = tcp_state[state];
@@ -226,7 +226,7 @@ static void udp_do_one(int lnr, const char *line)
        char local_addr[64], rem_addr[64];
        char *state_str, more[512];
        int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        struct sockaddr_in6 localaddr, remaddr;
        char addr6[INET6_ADDRSTRLEN];
        struct in6_addr in6;
@@ -246,7 +246,7 @@ static void udp_do_one(int lnr, const char *line)
                                 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
 
        if (strlen(local_addr) > 8) {
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
         /* Demangle what the kernel gives us */
                sscanf(local_addr, "%08X%08X%08X%08X",
                           &in6.s6_addr32[0], &in6.s6_addr32[1],
@@ -271,7 +271,7 @@ static void udp_do_one(int lnr, const char *line)
        }
 
        if (num < 10) {
-               error_msg("warning, got bogus udp line.");
+               bb_error_msg("warning, got bogus udp line.");
                return;
        }
        switch (state) {
@@ -288,8 +288,8 @@ static void udp_do_one(int lnr, const char *line)
                        break;
        }
 
-#if CONFIG_FEATURE_IPV6
-#define notnull(A) (((A.sin6_family == AF_INET6) &&            \
+#ifdef CONFIG_FEATURE_IPV6
+# define notnull(A) (((A.sin6_family == AF_INET6) &&            \
                                         ((A.sin6_addr.s6_addr32[0]) ||            \
                                          (A.sin6_addr.s6_addr32[1]) ||            \
                                          (A.sin6_addr.s6_addr32[2]) ||            \
@@ -297,7 +297,7 @@ static void udp_do_one(int lnr, const char *line)
                                        ((A.sin6_family == AF_INET) &&             \
                                         ((struct sockaddr_in *) &A)->sin_addr.s_addr))
 #else
-#define notnull(A) (A.sin_addr.s_addr)
+# define notnull(A) (A.sin_addr.s_addr)
 #endif
        if ((notnull(remaddr) && (flags&NETSTAT_CONNECTED)) ||
                (!notnull(remaddr) && (flags&NETSTAT_LISTENING)))
@@ -321,7 +321,7 @@ static void raw_do_one(int lnr, const char *line)
        char local_addr[64], rem_addr[64];
        char *state_str, more[512];
        int num, local_port, rem_port, d, state, timer_run, uid, timeout;
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        struct sockaddr_in6 localaddr, remaddr;
        char addr6[INET6_ADDRSTRLEN];
        struct in6_addr in6;
@@ -341,7 +341,7 @@ static void raw_do_one(int lnr, const char *line)
                                 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
 
        if (strlen(local_addr) > 8) {
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
                sscanf(local_addr, "%08X%08X%08X%08X",
                           &in6.s6_addr32[0], &in6.s6_addr32[1],
                           &in6.s6_addr32[2], &in6.s6_addr32[3]);
@@ -365,13 +365,13 @@ static void raw_do_one(int lnr, const char *line)
        }
 
        if (num < 10) {
-               error_msg("warning, got bogus raw line.");
+               bb_error_msg("warning, got bogus raw line.");
                return;
        }
        state_str=itoa(state);
 
-#if CONFIG_FEATURE_IPV6
-#define notnull(A) (((A.sin6_family == AF_INET6) &&            \
+#ifdef CONFIG_FEATURE_IPV6
+# define notnull(A) (((A.sin6_family == AF_INET6) &&            \
                                         ((A.sin6_addr.s6_addr32[0]) ||            \
                                          (A.sin6_addr.s6_addr32[1]) ||            \
                                          (A.sin6_addr.s6_addr32[2]) ||            \
@@ -379,7 +379,7 @@ static void raw_do_one(int lnr, const char *line)
                                        ((A.sin6_family == AF_INET) &&             \
                                         ((struct sockaddr_in *) &A)->sin_addr.s_addr))
 #else
-#define notnull(A) (A.sin_addr.s_addr)
+# define notnull(A) (A.sin_addr.s_addr)
 #endif
        if ((notnull(remaddr) && (flags&NETSTAT_CONNECTED)) ||
                (!notnull(remaddr) && (flags&NETSTAT_LISTENING)))
@@ -418,7 +418,7 @@ static void unix_do_one(int nr, const char *line)
        num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
                                 &d, &refcnt, &proto, &unix_flags, &type, &state, &inode, path);
        if (num < 6) {
-               error_msg("warning, got bogus unix line.");
+               bb_error_msg("warning, got bogus unix line.");
                return;
        }
        if (!(has & HAS_INODE))
@@ -539,7 +539,7 @@ static void do_info(const char *file, const char *name, void (*proc)(int, const
                if (errno != ENOENT) {
                        perror(file);
                } else {
-               error_msg("no support for `%s' on this system.", name);
+               bb_error_msg("no support for `%s' on this system.", name);
                }
        } else {
                do {
@@ -559,12 +559,12 @@ int netstat_main(int argc, char **argv)
        int opt;
        int new_flags=0;
        int showroute = 0, extended = 0; 
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        int inet=1;
        int inet6=1;
 #else
-#define inet 1
-#define inet6 0
+# define inet 1
+# define inet6 0
 #endif
        while ((opt = getopt(argc, argv, "laenrtuwx")) != -1)
                switch (opt) {
@@ -597,14 +597,14 @@ int netstat_main(int argc, char **argv)
                        new_flags |= NETSTAT_UNIX;
                        break;
                default:
-                       show_usage();
+                       bb_show_usage();
                }
        if ( showroute ) {
 #ifdef CONFIG_ROUTE    
                displayroutes ( flags & NETSTAT_NUMERIC, !extended );
                return 0; 
 #else
-               error_msg_and_die( "-r (display routing table) is not compiled in." );
+               bb_error_msg_and_die( "-r (display routing table) is not compiled in." );
 #endif
        }       
                
@@ -627,19 +627,19 @@ int netstat_main(int argc, char **argv)
        }
        if (inet && flags&NETSTAT_TCP)
                do_info(_PATH_PROCNET_TCP,"AF INET (tcp)",tcp_do_one);
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        if (inet6 && flags&NETSTAT_TCP)
                do_info(_PATH_PROCNET_TCP6,"AF INET6 (tcp)",tcp_do_one);
 #endif
        if (inet && flags&NETSTAT_UDP)
                do_info(_PATH_PROCNET_UDP,"AF INET (udp)",udp_do_one);
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        if (inet6 && flags&NETSTAT_UDP)
                do_info(_PATH_PROCNET_UDP6,"AF INET6 (udp)",udp_do_one);
 #endif
        if (inet && flags&NETSTAT_RAW)
                do_info(_PATH_PROCNET_RAW,"AF INET (raw)",raw_do_one);
-#if CONFIG_FEATURE_IPV6
+#ifdef CONFIG_FEATURE_IPV6
        if (inet6 && flags&NETSTAT_RAW)
                do_info(_PATH_PROCNET_RAW6,"AF INET6 (raw)",raw_do_one);
 #endif