Skip to content

Commit fbb804f

Browse files
committed
Add semicolon to end of RCUTILS_LOGGING_AUTOINIT.
Signed-off-by: Chris Lalancette <[email protected]>
1 parent d8d9599 commit fbb804f

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

resource/logging_macros.h.em

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ extern "C"
6565
*/
6666
#define RCUTILS_LOG_COND_NAMED(severity, condition_before, condition_after, name, ...) \
6767
do { \
68-
RCUTILS_LOGGING_AUTOINIT \
68+
RCUTILS_LOGGING_AUTOINIT; \
6969
static rcutils_log_location_t __rcutils_logging_location = {__func__, __FILE__, __LINE__}; \
7070
if (rcutils_logging_logger_is_enabled_for(name, severity)) { \
7171
condition_before \

src/logging.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -342,39 +342,35 @@ rcutils_logging_severity_level_from_string(
342342

343343
rcutils_logging_output_handler_t rcutils_logging_get_output_handler(void)
344344
{
345-
RCUTILS_LOGGING_AUTOINIT
345+
RCUTILS_LOGGING_AUTOINIT;
346346
return g_rcutils_logging_output_handler;
347347
}
348348

349349
void rcutils_logging_set_output_handler(rcutils_logging_output_handler_t function)
350350
{
351-
// *INDENT-OFF* (prevent uncrustify from making unnecessary indents here)
352-
RCUTILS_LOGGING_AUTOINIT
351+
RCUTILS_LOGGING_AUTOINIT;
353352
g_rcutils_logging_output_handler = function;
354-
// *INDENT-ON*
355353
}
356354

357355
int rcutils_logging_get_default_logger_level(void)
358356
{
359-
RCUTILS_LOGGING_AUTOINIT
357+
RCUTILS_LOGGING_AUTOINIT;
360358
return g_rcutils_logging_default_logger_level;
361359
}
362360

363361
void rcutils_logging_set_default_logger_level(int level)
364362
{
365-
// *INDENT-OFF* (prevent uncrustify from making unnecessary indents here)
366-
RCUTILS_LOGGING_AUTOINIT
363+
RCUTILS_LOGGING_AUTOINIT;
367364
if (RCUTILS_LOG_SEVERITY_UNSET == level) {
368365
// Restore the default
369366
level = RCUTILS_DEFAULT_LOGGER_DEFAULT_LEVEL;
370367
}
371368
g_rcutils_logging_default_logger_level = level;
372-
// *INDENT-ON*
373369
}
374370

375371
int rcutils_logging_get_logger_level(const char * name)
376372
{
377-
RCUTILS_LOGGING_AUTOINIT
373+
RCUTILS_LOGGING_AUTOINIT;
378374
if (NULL == name) {
379375
return -1;
380376
}
@@ -383,7 +379,7 @@ int rcutils_logging_get_logger_level(const char * name)
383379

384380
int rcutils_logging_get_logger_leveln(const char * name, size_t name_length)
385381
{
386-
RCUTILS_LOGGING_AUTOINIT
382+
RCUTILS_LOGGING_AUTOINIT;
387383
if (NULL == name) {
388384
return -1;
389385
}
@@ -421,7 +417,7 @@ int rcutils_logging_get_logger_leveln(const char * name, size_t name_length)
421417

422418
int rcutils_logging_get_logger_effective_level(const char * name)
423419
{
424-
RCUTILS_LOGGING_AUTOINIT
420+
RCUTILS_LOGGING_AUTOINIT;
425421
if (NULL == name) {
426422
return -1;
427423
}
@@ -453,7 +449,7 @@ int rcutils_logging_get_logger_effective_level(const char * name)
453449

454450
rcutils_ret_t rcutils_logging_set_logger_level(const char * name, int level)
455451
{
456-
RCUTILS_LOGGING_AUTOINIT
452+
RCUTILS_LOGGING_AUTOINIT;
457453
if (NULL == name) {
458454
RCUTILS_SET_ERROR_MSG("Invalid logger name");
459455
return RCUTILS_RET_INVALID_ARGUMENT;
@@ -494,7 +490,7 @@ rcutils_ret_t rcutils_logging_set_logger_level(const char * name, int level)
494490

495491
bool rcutils_logging_logger_is_enabled_for(const char * name, int severity)
496492
{
497-
RCUTILS_LOGGING_AUTOINIT
493+
RCUTILS_LOGGING_AUTOINIT;
498494
int logger_level = g_rcutils_logging_default_logger_level;
499495
if (name) {
500496
logger_level = rcutils_logging_get_logger_effective_level(name);

0 commit comments

Comments
 (0)