Manpage: cleanup layout of disable-event

[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 2af85fe476eb74abaf71ea7b456a6ee1723408b1..18a958d321e6101d1de0c2c6ff00f75fae9e06bd 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -113,11 +113,11 @@ static void usage(FILE *ofp)
        fprintf(ofp, "                             e.g.:\n");
        fprintf(ofp, "                               \"*\"\n");
        fprintf(ofp, "                               \"app_component:na*\"\n");
-       fprintf(ofp, "    --probe [addr | symbol | symbol+offset]\n");
+       fprintf(ofp, "    --probe (addr | symbol | symbol+offset)\n");
        fprintf(ofp, "                           Dynamic probe.\n");
        fprintf(ofp, "                           Addr and offset can be octal (0NNN...),\n");
        fprintf(ofp, "                           decimal (NNN...) or hexadecimal (0xNNN...)\n");
-       fprintf(ofp, "    --function [addr | symbol | symbol+offset]\n");
+       fprintf(ofp, "    --function (addr | symbol | symbol+offset)\n");
        fprintf(ofp, "                           Dynamic function entry/return probe.\n");
        fprintf(ofp, "                           Addr and offset can be octal (0NNN...),\n");
        fprintf(ofp, "                           decimal (NNN...) or hexadecimal (0xNNN...)\n");
@@ -168,7 +168,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "                           Expression examples:.\n");
        fprintf(ofp, "                           \n");
        fprintf(ofp, "                           'intfield > 500 && intfield < 503'\n");
-       fprintf(ofp, "                           '(stringfield == \"test\" || intfield != 10) && intfield > 33'\n");
+       fprintf(ofp, "                           '(strfield == \"test\" || intfield != 10) && intfield > 33'\n");
        fprintf(ofp, "                           'doublefield > 1.1 && intfield < 5.3'\n");
        fprintf(ofp, "                           \n");
        fprintf(ofp, "                           Wildcards are allowed at the end of strings:\n");
@@ -268,7 +268,11 @@ int loglevel_str_to_value(const char *inputstr)
        int i = 0;
        char str[LTTNG_SYMBOL_NAME_LEN];
 
-       while (i < LTTNG_SYMBOL_NAME_LEN && inputstr[i] != '\0') {
+       /*
+        * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
+        * added at the end of the loop so a the upper bound we avoid the overflow.
+        */
+       while (i < (LTTNG_SYMBOL_NAME_LEN - 1) && inputstr[i] != '\0') {
                str[i] = toupper(inputstr[i]);
                i++;
        }
@@ -336,7 +340,7 @@ static int enable_events(char *session_name)
        } else if (opt_userspace) {
                dom.type = LTTNG_DOMAIN_UST;
                /* Default. */
-               dom.buf_type = LTTNG_BUFFER_PER_PID;
+               dom.buf_type = LTTNG_BUFFER_PER_UID;
        } else {
                ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                ret = CMD_ERROR;