Remove some defined statements

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

diff --git a/networking/netstat.c b/networking/netstat.c
index efca422ad44139a794993ca7802e78e4838d8044..17a58876c37a1ceaa4912b0651ca635391262261 100644 (file)
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -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];
@@ -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) {
@@ -365,7 +365,7 @@ 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);
@@ -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 {
@@ -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