From 225da6f36fc7e6d75b888283d6710cb259e60d99 Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Thu, 15 Jun 2017 16:58:32 +0900 Subject: [PATCH] sensord: fix bugs with using invalid format in logs Change-Id: Ide24272d63a24611aba81a5fe0114e62cebeb1fe Signed-off-by: kibak.yoon --- src/client/sensor_internal.cpp | 38 ++++++++++++++++----------------- src/client/sensor_manager.cpp | 2 +- src/shared/seqpacket_socket.cpp | 6 +++--- src/shared/socket.cpp | 2 +- src/shared/stream_socket.cpp | 6 +++--- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/client/sensor_internal.cpp b/src/client/sensor_internal.cpp index fe3e5542..22d88403 100644 --- a/src/client/sensor_internal.cpp +++ b/src/client/sensor_internal.cpp @@ -115,10 +115,10 @@ API int sensord_get_default_sensor(sensor_type_t type, sensor_t *sensor) API bool sensord_get_type(sensor_t sensor, sensor_type_t *type) { - retvm_if(!type, false, "Invalid parameter[%#x]", type); + retvm_if(!type, false, "Invalid type"); retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); *type = static_cast(sensor)->get_type(); @@ -129,7 +129,7 @@ API const char* sensord_get_uri(sensor_t sensor) { retvm_if(!manager.connect(), NULL, "Failed to connect"); retvm_if(!manager.is_supported(sensor), NULL, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); return static_cast(sensor)->get_uri().c_str(); } @@ -138,7 +138,7 @@ API const char* sensord_get_name(sensor_t sensor) { retvm_if(!manager.connect(), NULL, "Failed to connect"); retvm_if(!manager.is_supported(sensor), NULL, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); return static_cast(sensor)->get_model().c_str(); } @@ -147,17 +147,17 @@ API const char* sensord_get_vendor(sensor_t sensor) { retvm_if(!manager.connect(), NULL, "Failed to connect"); retvm_if(!manager.is_supported(sensor), NULL, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); return static_cast(sensor)->get_vendor().c_str(); } API bool sensord_get_min_range(sensor_t sensor, float *min_range) { - retvm_if(!min_range, false, "Invalid parameter[%#x]", min_range); + retvm_if(!min_range, false, "Invalid paramter"); retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); *min_range = static_cast(sensor)->get_min_range(); @@ -166,10 +166,10 @@ API bool sensord_get_min_range(sensor_t sensor, float *min_range) API bool sensord_get_max_range(sensor_t sensor, float *max_range) { - retvm_if(!max_range, false, "Invalid parameter[%#x]", max_range); + retvm_if(!max_range, false, "Invalid parameter"); retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); *max_range = static_cast(sensor)->get_max_range(); @@ -178,10 +178,10 @@ API bool sensord_get_max_range(sensor_t sensor, float *max_range) API bool sensord_get_resolution(sensor_t sensor, float *resolution) { - retvm_if(!resolution, false, "Invalid parameter[%#x]", resolution); + retvm_if(!resolution, false, "Invalid parameter"); retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); *resolution = static_cast(sensor)->get_resolution(); @@ -190,10 +190,10 @@ API bool sensord_get_resolution(sensor_t sensor, float *resolution) API bool sensord_get_min_interval(sensor_t sensor, int *min_interval) { - retvm_if(!min_interval, false, "Invalid parameter[%#x]", min_interval); + retvm_if(!min_interval, false, "Invalid parameter"); retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); *min_interval = static_cast(sensor)->get_min_interval(); @@ -202,10 +202,10 @@ API bool sensord_get_min_interval(sensor_t sensor, int *min_interval) API bool sensord_get_fifo_count(sensor_t sensor, int *fifo_count) { - retvm_if(!fifo_count, false, "Invalid parameter[%#x]", fifo_count); + retvm_if(!fifo_count, false, "Invalid parameter"); retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); *fifo_count = 0; @@ -214,10 +214,10 @@ API bool sensord_get_fifo_count(sensor_t sensor, int *fifo_count) API bool sensord_get_max_batch_count(sensor_t sensor, int *max_batch_count) { - retvm_if(!max_batch_count, false, "Invalid parameter[%#x]", max_batch_count); + retvm_if(!max_batch_count, false, "Invalid parameter"); retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); *max_batch_count = static_cast(sensor)->get_max_batch_count(); @@ -228,7 +228,7 @@ API bool sensord_is_wakeup_supported(sensor_t sensor) { retvm_if(!manager.connect(), false, "Failed to connect"); retvm_if(!manager.is_supported(sensor), false, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); return static_cast(sensor)->is_wakeup_supported(); } @@ -237,7 +237,7 @@ API int sensord_connect(sensor_t sensor) { retvm_if(!manager.connect(), -EIO, "Failed to connect"); retvm_if(!manager.is_supported(sensor), -EINVAL, - "Invalid sensor[%#x]", sensor); + "Invalid sensor[%p]", sensor); sensor::sensor_listener *listener; diff --git a/src/client/sensor_manager.cpp b/src/client/sensor_manager.cpp index 760a90b0..101b833d 100644 --- a/src/client/sensor_manager.cpp +++ b/src/client/sensor_manager.cpp @@ -83,7 +83,7 @@ int sensor_manager::get_sensors(const char *uri, sensor_t **list, int *count) bool sensor_manager::is_supported(sensor_t sensor) { - retvm_if(!sensor, false, "Invalid parameter[%#x]", sensor); + retvm_if(!sensor, false, "Invalid sensor"); for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) { if (&*it == sensor) diff --git a/src/shared/seqpacket_socket.cpp b/src/shared/seqpacket_socket.cpp index ef6e01bd..ad273947 100644 --- a/src/shared/seqpacket_socket.cpp +++ b/src/shared/seqpacket_socket.cpp @@ -54,7 +54,7 @@ ssize_t seqpacket_socket::on_send(const void *buffer, size_t size) const } while (err == EINTR); if (err) { - _ERRNO(errno, _E, "Failed to send(%d, %#x, %d) = %d", + _ERRNO(errno, _E, "Failed to send(%d, %p, %u) = %d", socket::get_fd(), buffer, size, len); } @@ -74,7 +74,7 @@ ssize_t seqpacket_socket::on_recv(void *buffer, size_t size) const if (len > 0) { err = 0; } else if (len == 0) { - _E("Failed to recv(%d, %#p , %d) = %d, because the peer performed shutdown!", + _E("Failed to recv(%d, %p , %u) = %d, because the peer performed shutdown!", socket::get_fd(), buffer, size, len); err = 1; } else { @@ -86,7 +86,7 @@ ssize_t seqpacket_socket::on_recv(void *buffer, size_t size) const return 0; if (err) { - _ERRNO(errno, _E, "Failed to recv(%d, %#x, %d) = %d", + _ERRNO(errno, _E, "Failed to recv(%d, %p, %u) = %d", socket::get_fd(), buffer, size, len); } diff --git a/src/shared/socket.cpp b/src/shared/socket.cpp index f053dbc5..aed28df7 100644 --- a/src/shared/socket.cpp +++ b/src/shared/socket.cpp @@ -422,7 +422,7 @@ bool socket::has_connected(void) } if (so_error) { - _E("Failed to connect[%d]: %d", so_error); + _E("Failed to connect[%d] : %d", m_sock_fd, so_error); return false; } diff --git a/src/shared/stream_socket.cpp b/src/shared/stream_socket.cpp index 8ec9f7c5..e583f26d 100644 --- a/src/shared/stream_socket.cpp +++ b/src/shared/stream_socket.cpp @@ -58,7 +58,7 @@ ssize_t stream_socket::on_send(const void *buffer, size_t size) const continue; } - _ERRNO(errno, _E, "Failed to send(%d, %#p, %x, %d) = %d", + _ERRNO(errno, _E, "Failed to send(%d, %p, %u, %u) = %d", get_fd(), buffer, total_size, size - total_size, len); return -errno; } @@ -81,7 +81,7 @@ ssize_t stream_socket::on_recv(void *buffer, size_t size) const socket::get_mode()); if (len == 0) { - _E("Failed to recv(%d, %#p + %x, %d) = %d, because the peer performed shutdown", + _E("Failed to recv(%d, %p + %x, %u) = %d, because the peer performed shutdown", get_fd(), buffer, total_size, size - total_size, len); return -1; } @@ -92,7 +92,7 @@ ssize_t stream_socket::on_recv(void *buffer, size_t size) const continue; } - _ERRNO(errno, _E, "Failed to recv(%d, %#p, %x, %d) = %d", + _ERRNO(errno, _E, "Failed to recv(%d, %p, %u, %u) = %d", get_fd(), buffer, total_size, size - total_size, len); return -errno; } -- 2.34.1