From 2f02ae5f51eb5796aff7184797e5a0047ca239f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1ri=20Tristan=20Helgason?= Date: Tue, 1 Mar 2016 22:43:12 +0000 Subject: [PATCH] linux: replace calls to fopen with uv__open_file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/libuv/libuv/pull/743 Reviewed-By: Ben Noordhuis Reviewed-By: Saúl Ibarra Corretgé --- src/unix/linux-core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c index 7468015c..f581cfef 100644 --- a/src/unix/linux-core.c +++ b/src/unix/linux-core.c @@ -575,18 +575,12 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { unsigned int numcpus; uv_cpu_info_t* ci; int err; - int statfile_fd; FILE* statfile_fp; *cpu_infos = NULL; *count = 0; - err = uv__open_cloexec("/proc/stat", O_RDONLY); - if (err < 0) - return err; - statfile_fd = err; - - statfile_fp = fdopen(statfile_fd, "r"); + statfile_fp = uv__open_file("/proc/stat"); if (statfile_fp == NULL) return -errno; @@ -667,7 +661,7 @@ static int read_models(unsigned int numcpus, uv_cpu_info_t* ci) { defined(__i386__) || \ defined(__mips__) || \ defined(__x86_64__) - fp = fopen("/proc/cpuinfo", "r"); + fp = uv__open_file("/proc/cpuinfo"); if (fp == NULL) return -errno; @@ -814,7 +808,7 @@ static unsigned long read_cpufreq(unsigned int cpunum) { "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq", cpunum); - fp = fopen(buf, "r"); + fp = uv__open_file(buf); if (fp == NULL) return 0;