Fix: add missing string msg for save/load error code

Also, the LTTNG_ERR_LOAD_SESSION_NOT_FOUND has been removed and replaced
by LTTNG_ERR_LOAD_SESSION_NOENT.

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/include/lttng/lttng-error.h b/include/lttng/lttng-error.h
index d3f71880f136dac71e6cc554392fff362bc17d7a..06baa040f63756f2aba65ea78681253b352b6fa4 100644 (file)
--- a/include/lttng/lttng-error.h
+++ b/include/lttng/lttng-error.h
@@ -116,10 +116,10 @@ enum lttng_error_code {
        LTTNG_ERR_NEED_CHANNEL_NAME      = 83,  /* Non-default channel exists within session: channel name needs to be specified with '-c name' */
        LTTNG_ERR_NO_UST                 = 84,  /* LTTng-UST tracer is not supported. Please rebuild lttng-tools with lttng-ust support enabled. */
        LTTNG_ERR_SAVE_FILE_EXIST        = 85,  /* Session file already exists. */
-       /* 86 */
-       /* 87 */
-       /* 88 */
-       /* 89 */
+       LTTNG_ERR_SAVE_IO_FAIL           = 86,  /* IO error while writting session configuration */
+       LTTNG_ERR_LOAD_INVALID_CONFIG    = 87,  /* Invalid session configuration */
+       LTTNG_ERR_LOAD_IO_FAIL           = 88,  /* IO error while reading a session configuration */
+       LTTNG_ERR_LOAD_SESSION_NOENT     = 89,  /* Session file not found */
        /* 90 */
        /* 91 */
        /* 92 */
@@ -142,11 +142,6 @@ enum lttng_error_code {
        LTTNG_ERR_NO_CONSUMER            = 109, /* No consumer exist for the session */
        LTTNG_ERR_EXCLUSION_INVAL        = 110, /* Invalid event exclusion data */
        LTTNG_ERR_EXCLUSION_NOMEM        = 111, /* Lack of memory while processing event exclusions */
-       LTTNG_ERR_SAVE_IO_FAIL           = 112, /* IO error while writting session configuration */
-       LTTNG_ERR_LOAD_INVALID_CONFIG    = 113, /* Invalid session configuration */
-       LTTNG_ERR_LOAD_IO_FAIL           = 114, /* IO error while reading a session configuration */
-       LTTNG_ERR_LOAD_SESSION_NOT_FOUND = 115, /* Session configuration not found */
-       LTTNG_ERR_LOAD_SESSION_NOENT     = 116, /* Session file not found */
 
        /* MUST be last element */
        LTTNG_ERR_NR,                           /* Last element */

diff --git a/src/common/config/config.c b/src/common/config/config.c
index 088d5b55a1b7e7c926f9ee4c0e1444a41b94ac38..04bd2fdf207a71539e4e27a8b26f296b957a4c0b 100644 (file)
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -2176,7 +2176,7 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 
        if (session_name && strcmp(name, session_name)) {
                /* This is not the session we are looking for */
-               ret = -LTTNG_ERR_LOAD_SESSION_NOT_FOUND;
+               ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
                goto end;
        }
 
@@ -2328,7 +2328,7 @@ int load_session_from_file(const char *path, const char *session_name,
 end:
        xmlFreeDoc(doc);
        if (!ret) {
-               ret = session_found ? 0 : -LTTNG_ERR_LOAD_SESSION_NOT_FOUND;
+               ret = session_found ? 0 : -LTTNG_ERR_LOAD_SESSION_NOENT;
        }
        return ret;
 }
@@ -2430,7 +2430,7 @@ end:
        }
 
        if (!session_found) {
-               ret = -LTTNG_ERR_LOAD_SESSION_NOT_FOUND;
+               ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
        }
 
        return ret;

diff --git a/src/common/error.c b/src/common/error.c
index b66c12d946e03dec8a66cd1e713e38344392ed01..eec9b7a3e3e6645d803cf03dff8590571199a438 100644 (file)
--- a/src/common/error.c
+++ b/src/common/error.c
@@ -118,6 +118,10 @@ static const char *error_string_array[] = {
        [ ERROR_INDEX(LTTNG_ERR_NO_CHANNEL) ] = "No channel found in the session",
        [ ERROR_INDEX(LTTNG_ERR_SESSION_INVALID_CHAR) ] = "Invalid character found in session name",
        [ ERROR_INDEX(LTTNG_ERR_SAVE_FILE_EXIST) ] = "Session file already exists",
+       [ ERROR_INDEX(LTTNG_ERR_SAVE_IO_FAIL) ] = "IO error while writting session configuration",
+       [ 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",
 
        /* Last element */
        [ ERROR_INDEX(LTTNG_ERR_NR) ] = "Unknown error code"