ss: Eliminate unix_use_proc()

This function is used only at a single place anymore, so replace the
call to it by it's content, which makes that specific part of
unix_show() consistent with e.g. tcp_show().

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/misc/ss.c b/misc/ss.c
index 8441e9b7ade9d874daf3ec2b3a315c2a0cbb51a7..54b82cc8233af96535e346c3b7ba16e4a0bee860 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -3038,11 +3038,6 @@ static bool unix_type_skip(struct sockstat *s, struct filter *f)
        return false;
 }
 
-static bool unix_use_proc(void)
-{
-       return getenv("PROC_NET_UNIX") || getenv("PROC_ROOT");
-}
-
 static void unix_stats_print(struct sockstat *s, struct filter *f)
 {
        char port_name[30] = {};
@@ -3166,7 +3161,8 @@ static int unix_show(struct filter *f)
        if (!filter_af_get(f, AF_UNIX))
                return 0;
 
-       if (!unix_use_proc() && unix_show_netlink(f) == 0)
+       if (!getenv("PROC_NET_UNIX") && !getenv("PROC_ROOT")
+           && unix_show_netlink(f) == 0)
                return 0;
 
        if ((fp = net_unix_open()) == NULL)