X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fnotification%2Fbase_client.c;h=b7e1a9f42f8eef81fa0be4ef55d924eec30c3034;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=bb12410e81f7ed971572e2dd3be1400826a9df72;hpb=ad63a966ae7a204528fa77599f92100d7341be7a;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/base_client.c b/tests/regression/tools/notification/base_client.c
index bb12410e8..b7e1a9f42 100644
--- a/tests/regression/tools/notification/base_client.c
+++ b/tests/regression/tools/notification/base_client.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
-#include <assert.h>
 
 #include <lttng/action/action.h>
 #include <lttng/action/list.h>
@@ -92,12 +91,24 @@ int parse_arguments(char **argv)
 	/* Ratio or bytes ? */
 	if (!strcasecmp("bytes", buffer_usage_threshold_type)) {
 		is_threshold_ratio = false;
-		sscanf(buffer_usage_threshold_value, "%" SCNu64, &threshold_bytes);
+		sscanf_ret = sscanf(buffer_usage_threshold_value, "%" SCNu64,
+				&threshold_bytes);
+		if (sscanf_ret != 1) {
+			printf("error: Invalid buffer usage threshold value bytes (integer), sscanf returned %d\n",
+					sscanf_ret);
+			goto error;
+		}
 	}
 
 	if (!strcasecmp("ratio", buffer_usage_threshold_type)) {
 		is_threshold_ratio = true;
-		sscanf(buffer_usage_threshold_value, "%lf", &threshold_ratio);
+		sscanf_ret = sscanf(buffer_usage_threshold_value, "%lf",
+				&threshold_ratio);
+		if (sscanf_ret != 1) {
+			printf("error: Invalid buffer usage threshold value ratio (float), sscanf returned %d\n",
+					sscanf_ret);
+			goto error;
+		}
 	}
 
 	/* Number of notification to expect */
@@ -129,6 +140,7 @@ int main(int argc, char **argv)
 	struct lttng_condition *condition = NULL;
 	struct lttng_action *action = NULL;
 	struct lttng_trigger *trigger = NULL;
+	enum lttng_error_code ret_code;
 
 	/*
 	 * Disable buffering on stdout.
@@ -257,14 +269,14 @@ int main(int argc, char **argv)
 		goto end;
 	}
 
-	ret = lttng_register_trigger(trigger);
+	ret_code = lttng_register_trigger_with_automatic_name(trigger);
 
 	/*
 	 * An equivalent trigger might already be registered if an other app
 	 * registered an equivalent trigger.
 	 */
-	if (ret < 0 && ret != -LTTNG_ERR_TRIGGER_EXISTS) {
-		printf("error: %s\n", lttng_strerror(ret));
+	if (ret_code != LTTNG_OK && ret_code != LTTNG_ERR_TRIGGER_EXISTS) {
+		printf("error: %s\n", lttng_strerror(-ret_code));
 		ret = 1;
 		goto end;
 	}