Disallow wildcards in event names except as the last character

[lttng-tools.git] / src / common / error.c

diff --git a/src/common/error.c b/src/common/error.c
index 93b69843db7c1cd7984216d6c013dcd84939f5be..55d56e6602d72c9da3527111f43bf58c4f0d2d9b 100644 (file)
--- a/src/common/error.c
+++ b/src/common/error.c
@@ -29,6 +29,7 @@
 /* TLS variable that contains the time of one single log entry. */
 DEFINE_URCU_TLS(struct log_time, error_log_time);
 
+LTTNG_HIDDEN
 const char *log_add_time(void)
 {
        int ret;
@@ -48,14 +49,14 @@ const char *log_add_time(void)
        }
 
        /* Format time in the TLS variable. */
-       ret = snprintf(error_log_time.str, sizeof(error_log_time.str),
+       ret = snprintf(URCU_TLS(error_log_time).str, sizeof(error_log_time.str),
                        "%02d:%02d:%02d.%06ld",
                        tm.tm_hour, tm.tm_min, tm.tm_sec, tp.tv_nsec);
        if (ret < 0) {
                goto error;
        }
 
-       return error_log_time.str;
+       return URCU_TLS(error_log_time).str;
 
 error:
        /* Return an empty string on error so logging is not affected. */
@@ -159,6 +160,11 @@ static const char *error_string_array[] = {
        [ ERROR_INDEX(LTTNG_ERR_LOAD_INVALID_CONFIG) ] = "Invalid session configuration",
        [ ERROR_INDEX(LTTNG_ERR_LOAD_IO_FAIL) ] = "IO error while reading a session configuration",
        [ ERROR_INDEX(LTTNG_ERR_LOAD_SESSION_NOENT) ] = "Session file not found",
+       [ ERROR_INDEX(LTTNG_ERR_MAX_SIZE_INVALID) ] = "Snapshot max size is invalid",
+       [ ERROR_INDEX(LTTNG_ERR_MI_OUTPUT_TYPE) ] = "Invalid MI output format",
+       [ ERROR_INDEX(LTTNG_ERR_MI_IO_FAIL) ] = "IO error while writing MI output",
+       [ ERROR_INDEX(LTTNG_ERR_MI_NOT_IMPLEMENTED) ] = "Mi feature not implemented",
+       [ ERROR_INDEX(LTTNG_ERR_INVALID_EVENT_NAME) ] = "Invalid event name",
 
        /* Last element */
        [ ERROR_INDEX(LTTNG_ERR_NR) ] = "Unknown error code"