X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=3d32cbf813bc2615b211888748018fbebb77b5d8;hp=f7c5553da55b211383e31fb0fe92c3c6083693d1;hb=54185c70692f8a6d9c667214743e0ffd07a0afa3;hpb=bb77204a261b474f7b659247c5fda93de4e40b86

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index f7c5553da..3d32cbf81 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -305,12 +305,10 @@ end:
  */
 static int warn_userspace_probe_syntax(const char *symbol)
 {
-	unsigned long addr = 0;
-	size_t offset = 0;
 	int ret;
 
 	/* Check if the symbol field is an hex address. */
-	ret = sscanf(symbol, "0x%lx", &addr);
+	ret = sscanf(symbol, "0x%*x");
 	if (ret > 0) {
 		/* If there is a match, print a warning and return an error. */
 		ERR("Userspace probe on address not supported yet.");
@@ -319,7 +317,7 @@ static int warn_userspace_probe_syntax(const char *symbol)
 	}
 
 	/* Check if the symbol field is an decimal address. */
-	ret = sscanf(symbol, "%lu", &addr);
+	ret = sscanf(symbol, "%*u");
 	if (ret > 0) {
 		/* If there is a match, print a warning and return an error. */
 		ERR("Userspace probe on address not supported yet.");
@@ -328,7 +326,7 @@ static int warn_userspace_probe_syntax(const char *symbol)
 	}
 
 	/* Check if the symbol field is symbol+hex_offset. */
-	ret = sscanf(symbol, "%*[^+]+0x%lx", &offset);
+	ret = sscanf(symbol, "%*[^+]+0x%*x");
 	if (ret > 0) {
 		/* If there is a match, print a warning and return an error. */
 		ERR("Userspace probe on symbol+offset not supported yet.");
@@ -337,7 +335,7 @@ static int warn_userspace_probe_syntax(const char *symbol)
 	}
 
 	/* Check if the symbol field is symbol+decimal_offset. */
-	ret = sscanf(symbol, "%*[^+]+%lu", &offset);
+	ret = sscanf(symbol, "%*[^+]+%*u");
 	if (ret > 0) {
 		/* If there is a match, print a warning and return an error. */
 		ERR("Userspace probe on symbol+offset not supported yet.");
@@ -486,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) {
@@ -807,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;
 
@@ -820,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;
 	}