From 975ac29d8fb8b180d6c9b7deea2dadd92a8adff3 Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Tue, 29 Mar 2016 10:43:01 +0900 Subject: [PATCH] sensord: rename sensord_get_sensor_*_ex() APIs to proper names Change-Id: I19b2c7aed8a6d02249bb91d02df87291b1d18f3f Signed-off-by: kibak.yoon --- src/client/client.cpp | 8 ++++---- src/client/sensor_internal.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index 8bbf2fb..302f6e9 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -334,7 +334,7 @@ static bool get_sensor_list(void) return true; } -API int sensord_get_sensor_list_ex(sensor_type_t type, sensor_t **list, int *sensor_count) +API int sensord_get_sensors(sensor_type_t type, sensor_t **list, int *sensor_count) { retvm_if (!get_sensor_list(), -EPERM, "Fail to get sensor list from server"); @@ -361,7 +361,7 @@ API int sensord_get_sensor_list_ex(sensor_type_t type, sensor_t **list, int *sen return OP_SUCCESS; } -API int sensord_get_sensor_ex(sensor_type_t type, sensor_t *sensor) +API int sensord_get_default_sensor(sensor_type_t type, sensor_t *sensor) { retvm_if (!get_sensor_list(), -EPERM, "Fail to get sensor list from server"); @@ -383,13 +383,13 @@ API int sensord_get_sensor_ex(sensor_type_t type, sensor_t *sensor) API bool sensord_get_sensor_list(sensor_type_t type, sensor_t **list, int *sensor_count) { - return (sensord_get_sensor_list_ex(type, list, sensor_count) == OP_SUCCESS); + return (sensord_get_sensors(type, list, sensor_count) == OP_SUCCESS); } API sensor_t sensord_get_sensor(sensor_type_t type) { sensor_t sensor; - sensord_get_sensor_ex(type, &sensor); + sensord_get_default_sensor(type, &sensor); return sensor; } diff --git a/src/client/sensor_internal.h b/src/client/sensor_internal.h index 86a1b00..e5cd958 100644 --- a/src/client/sensor_internal.h +++ b/src/client/sensor_internal.h @@ -73,7 +73,7 @@ sensor_t sensord_get_sensor(sensor_type_t type); * @retval -EACCES Permission denied * @retval -ENODATA NO sensor available */ -int sensord_get_sensor_list_ex(sensor_type_t type, sensor_t **list, int *sensor_count); +int sensord_get_sensors(sensor_type_t type, sensor_t **list, int *sensor_count); /** * @brief Get the default sensor for a given type. @@ -85,7 +85,7 @@ int sensord_get_sensor_list_ex(sensor_type_t type, sensor_t **list, int *sensor_ * @retval -EPERM Operation not permitted * @retval -EACCES Permission denied */ -int sensord_get_sensor_ex(sensor_type_t type, sensor_t *sensor); +int sensord_get_default_sensor(sensor_type_t type, sensor_t *sensor); /** * @brief Get the type of this sensor. -- 2.7.4