iproute2: move generic_proc_open into lib

the function has the same definition in ifstat and ss

v2: fix the typo in the chagelog
v3: rebase on master

Signed-off-by: Denis Kirjanov <dkirjanov@suse.de>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/utils.h b/include/utils.h
index 9ba129b8f2fe748e8f7c1c6189a2bc128f2b06c7..a2a98b9bf17d9ed42a6ca4ed7a9c6c601e9c942b 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -393,4 +393,6 @@ int proto_a2n(unsigned short *id, const char *buf,
 const char *proto_n2a(unsigned short id, char *buf, int len,
                      const struct proto *proto_tb, size_t tb_len);
 
+FILE *generic_proc_open(const char *env, const char *name);
+
 #endif /* __UTILS_H__ */

diff --git a/lib/utils.c b/lib/utils.c
index 6c1c1a8d31fddc86ec1b5128928eb36c981ddb56..deb7654a0b013cae66d53741cf85d89c7c2cca0f 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -2003,3 +2003,17 @@ int proto_a2n(unsigned short *id, const char *buf,
 
        return 0;
 }
+
+FILE *generic_proc_open(const char *env, const char *name)
+{
+       const char *p = getenv(env);
+       char store[128];
+
+       if (!p) {
+               p = getenv("PROC_ROOT") ? : "/proc";
+               snprintf(store, sizeof(store) - 1, "%s/%s", p, name);
+               p = store;
+       }
+
+       return fopen(p, "r");
+}

diff --git a/misc/nstat.c b/misc/nstat.c
index 7beb620b2f61208b42c5c066ea29b471505fcd4d..07d010dec35fe4e6c28c70e4c3eb0abd716d6d13 100644 (file)
--- a/misc/nstat.c
+++ b/misc/nstat.c
@@ -43,35 +43,22 @@ int npatterns;
 char info_source[128];
 int source_mismatch;
 
-static int generic_proc_open(const char *env, const char *name)
-{
-       char store[128];
-       char *p = getenv(env);
-
-       if (!p) {
-               p = getenv("PROC_ROOT") ? : "/proc";
-               snprintf(store, sizeof(store)-1, "%s/%s", p, name);
-               p = store;
-       }
-       return open(p, O_RDONLY);
-}
-
-static int net_netstat_open(void)
+static FILE *net_netstat_open(void)
 {
        return generic_proc_open("PROC_NET_NETSTAT", "net/netstat");
 }
 
-static int net_snmp_open(void)
+static FILE *net_snmp_open(void)
 {
        return generic_proc_open("PROC_NET_SNMP", "net/snmp");
 }
 
-static int net_snmp6_open(void)
+static FILE *net_snmp6_open(void)
 {
        return generic_proc_open("PROC_NET_SNMP6", "net/snmp6");
 }
 
-static int net_sctp_snmp_open(void)
+static FILE *net_sctp_snmp_open(void)
 {
        return generic_proc_open("PROC_NET_SCTP_SNMP", "net/sctp/snmp");
 }
@@ -277,7 +264,7 @@ static void load_ugly_table(FILE *fp)
 
 static void load_sctp_snmp(void)
 {
-       FILE *fp = fdopen(net_sctp_snmp_open(), "r");
+       FILE *fp = net_sctp_snmp_open();
 
        if (fp) {
                load_good_table(fp);
@@ -287,7 +274,7 @@ static void load_sctp_snmp(void)
 
 static void load_snmp(void)
 {
-       FILE *fp = fdopen(net_snmp_open(), "r");
+       FILE *fp = net_snmp_open();
 
        if (fp) {
                load_ugly_table(fp);
@@ -297,7 +284,7 @@ static void load_snmp(void)
 
 static void load_snmp6(void)
 {
-       FILE *fp = fdopen(net_snmp6_open(), "r");
+       FILE *fp = net_snmp6_open();
 
        if (fp) {
                load_good_table(fp);
@@ -307,7 +294,7 @@ static void load_snmp6(void)
 
 static void load_netstat(void)
 {
-       FILE *fp = fdopen(net_netstat_open(), "r");
+       FILE *fp = net_netstat_open();
 
        if (fp) {
                load_ugly_table(fp);

diff --git a/misc/ss.c b/misc/ss.c
index 3ebac13235056dc74fec7c1248be5ebf93bb1ba8..87008d7c97c8af9eae6eb7a71027f642068f8037 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -478,19 +478,6 @@ static void filter_merge_defaults(struct filter *f)
        }
 }
 
-static FILE *generic_proc_open(const char *env, const char *name)
-{
-       const char *p = getenv(env);
-       char store[128];
-
-       if (!p) {
-               p = getenv("PROC_ROOT") ? : "/proc";
-               snprintf(store, sizeof(store)-1, "%s/%s", p, name);
-               p = store;
-       }
-
-       return fopen(p, "r");
-}
 #define net_tcp_open()         generic_proc_open("PROC_NET_TCP", "net/tcp")
 #define net_tcp6_open()                generic_proc_open("PROC_NET_TCP6", "net/tcp6")
 #define net_udp_open()         generic_proc_open("PROC_NET_UDP", "net/udp")