Use compiler-agnostic defines to silence warning

[lttng-tools.git] / src / bin / lttng / commands / list_triggers.cpp

diff --git a/src/bin/lttng/commands/list_triggers.cpp b/src/bin/lttng/commands/list_triggers.cpp
index c9c6c265de053fb66cc3123c338ca6efa42057ac..58262a9e3cef678c19bf2be678eef62c929bbdc5 100644 (file)
--- a/src/bin/lttng/commands/list_triggers.cpp
+++ b/src/bin/lttng/commands/list_triggers.cpp
@@ -7,10 +7,10 @@
 
 #include "../command.hpp"
 #include "common/argpar-utils/argpar-utils.hpp"
 
 #include "../command.hpp"
 #include "common/argpar-utils/argpar-utils.hpp"

-#include "common/argpar/argpar.h"

 #include "common/dynamic-array.hpp"
 #include "common/mi-lttng.hpp"
 #include "lttng/action/list-internal.hpp"
 #include "common/dynamic-array.hpp"
 #include "common/mi-lttng.hpp"
 #include "lttng/action/list-internal.hpp"

+#include "vendor/argpar/argpar.h"

 
 /* For lttng_condition_type_str(). */
 #include "lttng/condition/condition-internal.hpp"
 
 /* For lttng_condition_type_str(). */
 #include "lttng/condition/condition-internal.hpp"


@@ -135,6 +135,9 @@ static const char *get_pretty_loglevel_name(enum lttng_event_rule_type event_rul
        case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
                name = loglevel_log4j_value_to_name(loglevel);
                break;
        case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
                name = loglevel_log4j_value_to_name(loglevel);
                break;

+       case LTTNG_EVENT_RULE_TYPE_LOG4J2_LOGGING:
+               name = loglevel_log4j2_value_to_name(loglevel);
+               break;

        case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
                name = loglevel_jul_value_to_name(loglevel);
                break;
        case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
                name = loglevel_jul_value_to_name(loglevel);
                break;


@@ -250,7 +253,7 @@ static void print_event_rule_kernel_tracepoint(const struct lttng_event_rule *ev
 static void print_event_rule_logging(const struct lttng_event_rule *event_rule)
 {
        enum lttng_event_rule_status event_rule_status;
 static void print_event_rule_logging(const struct lttng_event_rule *event_rule)
 {
        enum lttng_event_rule_status event_rule_status;

-       enum lttng_event_rule_type event_rule_type = lttng_event_rule_get_type(event_rule);
+       const lttng_event_rule_type event_rule_type = lttng_event_rule_get_type(event_rule);

        const char *pattern;
        const char *filter;
        int log_level;
        const char *pattern;
        const char *filter;
        int log_level;


@@ -274,6 +277,12 @@ static void print_event_rule_logging(const struct lttng_event_rule *event_rule)
                logging_get_log_level_rule = lttng_event_rule_log4j_logging_get_log_level_rule;
                type_str = "log4j";
                break;
                logging_get_log_level_rule = lttng_event_rule_log4j_logging_get_log_level_rule;
                type_str = "log4j";
                break;

+       case LTTNG_EVENT_RULE_TYPE_LOG4J2_LOGGING:
+               logging_get_name_pattern = lttng_event_rule_log4j2_logging_get_name_pattern;
+               logging_get_filter = lttng_event_rule_log4j2_logging_get_filter;
+               logging_get_log_level_rule = lttng_event_rule_log4j2_logging_get_log_level_rule;
+               type_str = "log4j2";
+               break;

        case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
                logging_get_name_pattern = lttng_event_rule_python_logging_get_name_pattern;
                logging_get_filter = lttng_event_rule_python_logging_get_filter;
        case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
                logging_get_name_pattern = lttng_event_rule_python_logging_get_name_pattern;
                logging_get_filter = lttng_event_rule_python_logging_get_filter;


@@ -513,6 +522,7 @@ static void print_event_rule(const struct lttng_event_rule *event_rule)
                break;
        case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
        case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
                break;
        case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
        case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:

+       case LTTNG_EVENT_RULE_TYPE_LOG4J2_LOGGING:

        case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
                print_event_rule_logging(event_rule);
                break;
        case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
                print_event_rule_logging(event_rule);
                break;


@@ -1024,11 +1034,10 @@ static void print_one_trigger(const struct lttng_trigger *trigger)
        action = lttng_trigger_get_const_action(trigger);
        action_type = lttng_action_get_type(action);
        if (action_type == LTTNG_ACTION_TYPE_LIST) {
        action = lttng_trigger_get_const_action(trigger);
        action_type = lttng_action_get_type(action);
        if (action_type == LTTNG_ACTION_TYPE_LIST) {

-               const struct lttng_action *subaction;

                uint64_t action_path_index = 0;
 
                MSG("  actions:");
                uint64_t action_path_index = 0;
 
                MSG("  actions:");

-               for_each_action_const (subaction, action) {
+               for (auto subaction : lttng::ctl::const_action_list_view(action)) {

                        _MSG("    ");
                        print_one_action(trigger, subaction, &action_path_index, 1);
                        action_path_index++;
                        _MSG("    ");
                        print_one_action(trigger, subaction, &action_path_index, 1);
                        action_path_index++;