Error early on invalid tracker type for UST domain

[lttng-tools.git] / src / bin / lttng / commands / enable_events.c

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index b4e6320c52a84619888b344b7037107c1aed8fc2..6889b63d73eb12cacc8db055c4bd0d2a0bcc1fd1 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -435,7 +435,7 @@ static int parse_userspace_probe_opts(struct lttng_event *ev, char *opt)
                lookup_method =
                        lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create();
                if (!lookup_method) {
-                       WARN("Failed to create ELF lookup method");
+                       WARN("Failed to create SDT lookup method");
                        ret = CMD_ERROR;
                        goto end_string;
                }
@@ -484,8 +484,8 @@ static int parse_userspace_probe_opts(struct lttng_event *ev, char *opt)
                }
 
                /*
-                * Check if the file exists using access(2). If it does not, walk the
-                * $PATH.
+                * Check if the file exists using access(2), If it does not,
+                * return an error.
                 */
                ret = access(real_target_path, F_OK);
                if (ret) {
@@ -805,7 +805,7 @@ char *print_exclusions(char **names)
 {
        int length = 0;
        int i;
-       const char *preamble = " excluding ";
+       const char preamble[] = " excluding ";
        char *ret;
        int count = names ? strutils_array_of_strings_len(names) : 0;
 
@@ -818,9 +818,8 @@ char *print_exclusions(char **names)
                length += strlen(names[i]) + 4;
        }
 
-       /* add length of preamble + one for NUL - one for last (missing) comma */
-       length += strlen(preamble);
-       ret = zmalloc(length + 1);
+       length += sizeof(preamble);
+       ret = zmalloc(length);
        if (!ret) {
                return NULL;
        }