Skip to content

Commit c8e5725

Browse files
committed
Remove newline from rcutils errror msgs
1 parent d78f59a commit c8e5725

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

src/logging.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ rcutils_ret_t rcutils_logging_initialize_with_allocator(rcutils_allocator_t allo
6767
if (!rcutils_allocator_is_valid(&allocator)) {
6868
allocator = rcutils_get_default_allocator();
6969
RCUTILS_SET_ERROR_MSG(
70-
"Provided allocator is invalid. Using the default allocator.\n", allocator);
70+
"Provided allocator is invalid. Using the default allocator.", allocator);
7171
ret = RCUTILS_RET_INVALID_ARGUMENT;
7272
}
7373
g_rcutils_logging_allocator = allocator;
@@ -92,7 +92,7 @@ rcutils_ret_t rcutils_logging_initialize_with_allocator(rcutils_allocator_t allo
9292
rcutils_reset_error();
9393
}
9494
RCUTILS_SET_ERROR_MSG(
95-
"Failed to get output format from env. variable. Using default output format.\n",
95+
"Failed to get output format from env. variable. Using default output format.",
9696
g_rcutils_logging_allocator);
9797
if (ret != RCUTILS_RET_OK) {
9898
ret = RCUTILS_RET_MULTIPLE_ERRORS;
@@ -113,7 +113,7 @@ rcutils_ret_t rcutils_logging_initialize_with_allocator(rcutils_allocator_t allo
113113
"Failed to initialize logging severities map: %s\n", rcutils_get_error_string_safe());
114114
rcutils_reset_error();
115115
RCUTILS_SET_ERROR_MSG(
116-
"Failed to initialize map for logger severities. Severities will not be configurable.\n",
116+
"Failed to initialize map for logger severities. Severities will not be configurable.",
117117
g_rcutils_logging_allocator);
118118
g_rcutils_logging_severities_map_valid = false;
119119
if (ret != RCUTILS_RET_OK) {
@@ -144,7 +144,7 @@ rcutils_ret_t rcutils_logging_shutdown()
144144
"Failed to finalize logging severities map: %s\n", rcutils_get_error_string_safe());
145145
rcutils_reset_error();
146146
RCUTILS_SET_ERROR_MSG(
147-
"Failed to finalize logging severities map.", g_rcutils_logging_allocator);
147+
"Failed to finalize logging severities map", g_rcutils_logging_allocator);
148148
ret = RCUTILS_RET_LOGGING_SEVERITY_MAP_INVALID;
149149
}
150150
g_rcutils_logging_severities_map_valid = false;
@@ -272,7 +272,7 @@ rcutils_ret_t rcutils_logging_set_logger_severity_threshold(const char * name, i
272272
{
273273
if (!name) {
274274
RCUTILS_SET_ERROR_MSG(
275-
"Invalid logger name.\n", g_rcutils_logging_allocator);
275+
"Invalid logger name", g_rcutils_logging_allocator);
276276
return RCUTILS_RET_INVALID_ARGUMENT;
277277
}
278278
RCUTILS_LOGGING_AUTOINIT
@@ -282,7 +282,7 @@ rcutils_ret_t rcutils_logging_set_logger_severity_threshold(const char * name, i
282282
}
283283
if (!g_rcutils_logging_severities_map_valid) {
284284
RCUTILS_SET_ERROR_MSG(
285-
"Logger severity map is invalid.\n", g_rcutils_logging_allocator);
285+
"Logger severity map is invalid", g_rcutils_logging_allocator);
286286
return RCUTILS_RET_LOGGING_SEVERITY_MAP_INVALID;
287287
}
288288

@@ -293,13 +293,13 @@ rcutils_ret_t rcutils_logging_set_logger_severity_threshold(const char * name, i
293293
(int)(sizeof(g_rcutils_log_severity_names) / sizeof(g_rcutils_log_severity_names[0])))
294294
{
295295
RCUTILS_SET_ERROR_MSG(
296-
"Invalid severity specified for logger.\n", g_rcutils_logging_allocator);
296+
"Invalid severity specified for logger", g_rcutils_logging_allocator);
297297
return RCUTILS_RET_INVALID_ARGUMENT;
298298
}
299299
const char * severity_string = g_rcutils_log_severity_names[severity];
300300
if (!severity_string) {
301301
RCUTILS_SET_ERROR_MSG(
302-
"Unable to determine severity_string for severity.\n", g_rcutils_logging_allocator);
302+
"Unable to determine severity_string for severity", g_rcutils_logging_allocator);
303303
return RCUTILS_RET_INVALID_ARGUMENT;
304304
}
305305
rcutils_ret_t string_map_ret = rcutils_string_map_set(
@@ -310,7 +310,7 @@ rcutils_ret_t rcutils_logging_set_logger_severity_threshold(const char * name, i
310310
"Error setting severity for logger named '%s': %s\n", name, rcutils_get_error_string_safe());
311311
rcutils_reset_error();
312312
RCUTILS_SET_ERROR_MSG(
313-
"Error setting severity for logger.\n", g_rcutils_logging_allocator);
313+
"Error setting severity for logger", g_rcutils_logging_allocator);
314314
return RCUTILS_RET_ERROR;
315315
}
316316
return RCUTILS_RET_OK;

0 commit comments

Comments
 (0)