Fix: circular inclusion of lttng.h results in warning

[lttng-tools.git] / tests / regression / tools / notification / base_client.c

diff --git a/tests/regression/tools/notification/base_client.c b/tests/regression/tools/notification/base_client.c
index 21a8ac3fe7a2a33775919aa4fab808be7157e31e..043952d4457eac8f717a110a5b4befa28c4b320b 100644 (file)
--- a/tests/regression/tools/notification/base_client.c
+++ b/tests/regression/tools/notification/base_client.c
@@ -41,6 +41,7 @@
 #include <lttng/notification/channel.h>
 #include <lttng/notification/notification.h>
 #include <lttng/trigger/trigger.h>
+#include <lttng/lttng-error.h>
 
 static unsigned int nr_notifications = 0;
 static unsigned int nr_expected_notifications = 0;
@@ -201,7 +202,7 @@ int main(int argc, char **argv)
                goto end;
        }
        condition_status = lttng_condition_buffer_usage_set_domain_type(
-                       condition, LTTNG_DOMAIN_UST);
+                       condition, domain_type);
        if (condition_status != LTTNG_CONDITION_STATUS_OK) {
                printf("error: Could not set domain type\n");
                ret = 1;
@@ -297,7 +298,9 @@ end:
        if (trigger) {
                lttng_unregister_trigger(trigger);
        }
-       lttng_notification_channel_unsubscribe(notification_channel, condition);
+       if (lttng_notification_channel_unsubscribe(notification_channel, condition)) {
+               printf("error: channel unsubscribe error\n");
+       }
        lttng_trigger_destroy(trigger);
        lttng_condition_destroy(condition);
        lttng_action_destroy(action);
@@ -330,12 +333,27 @@ int handle_condition(
        }
 
        /* Fetch info to test */
-       lttng_condition_buffer_usage_get_session_name(condition,
+       ret = lttng_condition_buffer_usage_get_session_name(condition,
                        &condition_session_name);
-       lttng_condition_buffer_usage_get_channel_name(condition,
+       if (ret) {
+               printf("error: session name could not be fetched\n");
+               ret = 1;
+               goto end;
+       }
+       ret = lttng_condition_buffer_usage_get_channel_name(condition,
                        &condition_channel_name);
-       lttng_condition_buffer_usage_get_domain_type(condition,
+       if (ret) {
+               printf("error: channel name could not be fetched\n");
+               ret = 1;
+               goto end;
+       }
+       ret = lttng_condition_buffer_usage_get_domain_type(condition,
                        &condition_domain_type);
+       if (ret) {
+               printf("error: domain type could not be fetched\n");
+               ret = 1;
+               goto end;
+       }
 
        if (strcmp(condition_session_name, session_name) != 0) {
                printf("error: session name differs\n");