From 040543eebf4983b1459a1e0e0e26dae68b80cc28 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Sat, 17 Aug 2019 19:15:57 +0200 Subject: [PATCH] src: move uv_free_cpu_info to uv-common.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/libuv/libuv/pull/2433 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: Saúl Ibarra Corretgé --- src/unix/aix-common.c | 10 ---------- src/unix/cygwin.c | 5 ----- src/unix/darwin.c | 11 ----------- src/unix/freebsd.c | 11 ----------- src/unix/haiku.c | 9 --------- src/unix/linux-core.c | 10 ---------- src/unix/netbsd.c | 11 ----------- src/unix/openbsd.c | 11 ----------- src/unix/os390.c | 7 ------- src/unix/sunos.c | 10 ---------- src/uv-common.c | 10 ++++++++++ src/win/util.c | 11 ----------- 12 files changed, 10 insertions(+), 106 deletions(-) diff --git a/src/unix/aix-common.c b/src/unix/aix-common.c index 63ac16a0..b9d313c0 100644 --- a/src/unix/aix-common.c +++ b/src/unix/aix-common.c @@ -155,16 +155,6 @@ int uv_exepath(char* buffer, size_t* size) { } } -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; ++i) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} - int uv_interface_addresses(uv_interface_address_t** addresses, int* count) { uv_interface_address_t* address; diff --git a/src/unix/cygwin.c b/src/unix/cygwin.c index 6b5cfb7b..169958d5 100644 --- a/src/unix/cygwin.c +++ b/src/unix/cygwin.c @@ -48,11 +48,6 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { return UV_ENOSYS; } -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - (void)cpu_infos; - (void)count; -} - uint64_t uv_get_constrained_memory(void) { return 0; /* Memory constraints are unknown. */ } diff --git a/src/unix/darwin.c b/src/unix/darwin.c index e4cd8ff7..5cf03aea 100644 --- a/src/unix/darwin.c +++ b/src/unix/darwin.c @@ -223,14 +223,3 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { return 0; } - - -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} diff --git a/src/unix/freebsd.c b/src/unix/freebsd.c index 7de88d6a..d0b7d8e9 100644 --- a/src/unix/freebsd.c +++ b/src/unix/freebsd.c @@ -288,14 +288,3 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { uv__free(cp_times); return 0; } - - -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} diff --git a/src/unix/haiku.c b/src/unix/haiku.c index 7708851c..cf17d836 100644 --- a/src/unix/haiku.c +++ b/src/unix/haiku.c @@ -165,12 +165,3 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { return 0; } - -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) - uv__free(cpu_infos[i].model); - - uv__free(cpu_infos); -} diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c index b539beb8..433e201f 100644 --- a/src/unix/linux-core.c +++ b/src/unix/linux-core.c @@ -812,16 +812,6 @@ static uint64_t read_cpufreq(unsigned int cpunum) { } -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} - static int uv__ifaddr_exclude(struct ifaddrs *ent, int exclude_type) { if (!((ent->ifa_flags & IFF_UP) && (ent->ifa_flags & IFF_RUNNING))) return 1; diff --git a/src/unix/netbsd.c b/src/unix/netbsd.c index c649bb37..cfe2c6a4 100644 --- a/src/unix/netbsd.c +++ b/src/unix/netbsd.c @@ -234,14 +234,3 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { uv__free(cp_times); return 0; } - - -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} diff --git a/src/unix/openbsd.c b/src/unix/openbsd.c index b189e850..1f5228dc 100644 --- a/src/unix/openbsd.c +++ b/src/unix/openbsd.c @@ -242,14 +242,3 @@ error: *cpu_infos = NULL; return UV__ERR(errno); } - - -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} diff --git a/src/unix/os390.c b/src/unix/os390.c index 273ded7c..a7305006 100644 --- a/src/unix/os390.c +++ b/src/unix/os390.c @@ -433,13 +433,6 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { } -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - for (int i = 0; i < count; ++i) - uv__free(cpu_infos[i].model); - uv__free(cpu_infos); -} - - static int uv__interface_addresses_v6(uv_interface_address_t** addresses, int* count) { uv_interface_address_t* address; diff --git a/src/unix/sunos.c b/src/unix/sunos.c index f323d1de..180cc846 100644 --- a/src/unix/sunos.c +++ b/src/unix/sunos.c @@ -696,16 +696,6 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { } -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} - #ifdef SUNOS_NO_IFADDRS int uv_interface_addresses(uv_interface_address_t** addresses, int* count) { *count = 0; diff --git a/src/uv-common.c b/src/uv-common.c index d1a5e2fb..70db53ab 100644 --- a/src/uv-common.c +++ b/src/uv-common.c @@ -797,3 +797,13 @@ void uv_os_free_environ(uv_env_item_t* envitems, int count) { uv__free(envitems); } + + +void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { + int i; + + for (i = 0; i < count; i++) + uv__free(cpu_infos[i].model); + + uv__free(cpu_infos); +} diff --git a/src/win/util.c b/src/win/util.c index 0d3b43f2..8849d041 100644 --- a/src/win/util.c +++ b/src/win/util.c @@ -721,17 +721,6 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos_ptr, int* cpu_count_ptr) { } -void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { - int i; - - for (i = 0; i < count; i++) { - uv__free(cpu_infos[i].model); - } - - uv__free(cpu_infos); -} - - static int is_windows_version_or_greater(DWORD os_major, DWORD os_minor, WORD service_pack_major,