From 38e5033b9716495db93a90a532d99867203429a8 Mon Sep 17 00:00:00 2001 From: "Oleksandr Shamray oleksandrs@mellanox.com" Date: Mon, 19 Jun 2017 14:19:17 +0000 Subject: [PATCH] Change OPEN_READ_FILE macros to the onlp_file_read() API in fani.c --- .../x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c | 5 ++--- .../x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c | 7 +++---- .../x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c | 7 +++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c index 281105ab..48110160 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c @@ -353,9 +353,8 @@ onlp_fani_get_min_rpm(int id) { int len = 0, nbytes = 10; char r_data[10] = {0}; - char fullpath[65] = {0}; - snprintf(fullpath, sizeof(fullpath), "%s%s", PREFIX_PATH, fan_path[id].min); - OPEN_READ_FILE(fullpath, r_data, nbytes, len); + if (onlp_file_read((uint8_t*)r_data, nbytes, &len, "%s%s", PREFIX_PATH, fan_path[id].min) < 0) + return ONLP_STATUS_E_INTERNAL; return atoi(r_data); } diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c index 289a0ef1..b33515fe 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c @@ -534,14 +534,13 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs) return ONLP_STATUS_E_UNSUPPORTED; } -int +int onlp_fani_get_min_rpm(int id) { int len = 0, nbytes = 10; char r_data[10] = {0}; - char fullpath[65] = {0}; - snprintf(fullpath, sizeof(fullpath), "%s%s", PREFIX_PATH, fan_path[id].min); - OPEN_READ_FILE(fullpath, r_data, nbytes, len); + if (onlp_file_read((uint8_t*)r_data, nbytes, &len, "%s%s", PREFIX_PATH, fan_path[id].min) < 0) + return ONLP_STATUS_E_INTERNAL; return atoi(r_data); } diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c index e15f7184..03df3efc 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c @@ -533,14 +533,13 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs) return ONLP_STATUS_E_UNSUPPORTED; } -int +int onlp_fani_get_min_rpm(int id) { int len = 0, nbytes = 10; char r_data[10] = {0}; - char fullpath[65] = {0}; - snprintf(fullpath, sizeof(fullpath), "%s%s", PREFIX_PATH, fan_path[id].min); - OPEN_READ_FILE(fullpath, r_data, nbytes, len); + if (onlp_file_read((uint8_t*)r_data, nbytes, &len, "%s%s", PREFIX_PATH, fan_path[id].min) < 0) + return ONLP_STATUS_E_INTERNAL; return atoi(r_data); }