niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

warn about unused return value for set_logger_level (#652)

Browse source 
* warn about unused return value for set_logger_level

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>

* revert change of RCL_UNUSED macro

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
This commit is contained in:
Dirk Thomas 2020-05-15 14:29:46 -07:00 • committed by GitHub
parent 51886399dd
commit 9fbf32d87d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rcl/include/rcl/logging_external_interface.h
View file

@ -19,6 +19,10 @@
#include "rcl/types.h" #include "rcl/types.h"
#include "rcl/visibility_control.h" #include "rcl/visibility_control.h"
#ifdef __cplusplus
extern "C" {
#endif
/// Initialize the external logging library. /// Initialize the external logging library.
/** /**
* \param[in] config_file The location of a config file that the external * \param[in] config_file The location of a config file that the external
@ -78,6 +82,11 @@ rcl_logging_external_log(int severity, const char * name, const char * msg);
* \return RCL_RET_ERROR if an unspecified error occurs. * \return RCL_RET_ERROR if an unspecified error occurs.
*/ */
RCL_PUBLIC RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t rcl_logging_external_set_logger_level(const char * name, int level); rcl_ret_t rcl_logging_external_set_logger_level(const char * name, int level);
#ifdef __cplusplus
}
#endif
#endif // RCL__LOGGING_EXTERNAL_INTERFACE_H_ #endif // RCL__LOGGING_EXTERNAL_INTERFACE_H_

6
rcl/include/rcl/macros.h
View file

@ -20,12 +20,8 @@ extern "C"
{ {
#endif #endif
#ifndef _WIN32
/// Ignored return values of functions with this macro will emit a warning. /// Ignored return values of functions with this macro will emit a warning.
# define RCL_WARN_UNUSED __attribute__((warn_unused_result)) #define RCL_WARN_UNUSED RCUTILS_WARN_UNUSED
#else
# define RCL_WARN_UNUSED _Check_return_
#endif
#define RCL_UNUSED(x) (void)(x) #define RCL_UNUSED(x) (void)(x)

8
rcl/src/rcl/logging.c
View file

@ -95,7 +95,13 @@ rcl_logging_configure(const rcl_arguments_t * global_args, const rcl_allocator_t
if (g_rcl_logging_ext_lib_enabled) { if (g_rcl_logging_ext_lib_enabled) {
status = rcl_logging_external_initialize(config_file, g_logging_allocator); status = rcl_logging_external_initialize(config_file, g_logging_allocator);
if (RCL_RET_OK == status) { if (RCL_RET_OK == status) {
rcl_logging_external_set_logger_level(NULL, default_level); // TODO(dirk-thomas) the return value should be typed and compared to
// constants instead of zero
int logging_status = rcl_logging_external_set_logger_level(
NULL, default_level);
if (logging_status != 0) {
status = RCL_RET_ERROR;
}
g_rcl_logging_out_handlers[g_rcl_logging_num_out_handlers++] = g_rcl_logging_out_handlers[g_rcl_logging_num_out_handlers++] =
rcl_logging_ext_lib_output_handler; rcl_logging_ext_lib_output_handler;
} }