From 4ffc44ca7c1ec7adb980b67ae1e1c8fa772777f1 Mon Sep 17 00:00:00 2001 From: Yu Zhiguo Date: Fri, 20 Jun 2008 09:50:16 +0800 Subject: [PATCH] Fix generic_proc_open() of command 'nstat' and 'rtacct' Fix a bug of generic_proc_open(), so environment variables (e.g. PROC_NET_SNMP, PROC_NET_RTACCT) can be used to specify procfile. Signed-off-by: Yu Zhiguo --- misc/nstat.c | 4 ++-- misc/rtacct.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/nstat.c b/misc/nstat.c index 228bce22..80e695fc 100644 --- a/misc/nstat.c +++ b/misc/nstat.c @@ -43,7 +43,7 @@ int npatterns; char info_source[128]; int source_mismatch; -int generic_proc_open(char *env, char *name) +static int generic_proc_open(const char *env, char *name) { char store[128]; char *p = getenv(env); @@ -52,7 +52,7 @@ int generic_proc_open(char *env, char *name) snprintf(store, sizeof(store)-1, "%s/%s", p, name); p = store; } - return open(store, O_RDONLY); + return open(p, O_RDONLY); } int net_netstat_open(void) diff --git a/misc/rtacct.c b/misc/rtacct.c index e6399d00..eb3ea9ec 100644 --- a/misc/rtacct.c +++ b/misc/rtacct.c @@ -43,7 +43,7 @@ int dump_zeros = 0; unsigned long magic_number = 0; double W; -int generic_proc_open(char *env, char *name) +static int generic_proc_open(const char *env, const char *name) { char store[1024]; char *p = getenv(env); @@ -52,7 +52,7 @@ int generic_proc_open(char *env, char *name) snprintf(store, sizeof(store)-1, "%s/%s", p, name); p = store; } - return open(store, O_RDONLY); + return open(p, O_RDONLY); } int net_rtacct_open(void)