Use compiler-agnostic defines to silence warning

[lttng-tools.git] / src / common / event-rule / log4j-logging.cpp

diff --git a/src/common/event-rule/log4j-logging.cpp b/src/common/event-rule/log4j-logging.cpp
index 5655cd3bcc8fec6d0722bc166c50fe8c8f246f9d..dc0c9f2df097219aa95968a208693c1158722e8b 100644 (file)
--- a/src/common/event-rule/log4j-logging.cpp
+++ b/src/common/event-rule/log4j-logging.cpp
@@ -231,7 +231,7 @@ static int generate_agent_filter(const struct lttng_event_rule *rule, char **_ag
                case LTTNG_LOG_LEVEL_RULE_TYPE_AT_LEAST_AS_SEVERE_AS:
                        llr_status = lttng_log_level_rule_at_least_as_severe_as_get_level(
                                log_level_rule, &level);
                case LTTNG_LOG_LEVEL_RULE_TYPE_AT_LEAST_AS_SEVERE_AS:
                        llr_status = lttng_log_level_rule_at_least_as_severe_as_get_level(
                                log_level_rule, &level);

-                       op = ">=";
+                       op = LTTNG_LOG4J_EVENT_RULE_AT_LEAST_AS_SEVERE_AS_OP;

                        break;
                default:
                        abort();
                        break;
                default:
                        abort();


@@ -413,7 +413,7 @@ lttng_event_rule_log4j_logging_generate_lttng_event(const struct lttng_event_rul
        status = lttng_event_rule_log4j_logging_get_log_level_rule(rule, &log_level_rule);
        if (status == LTTNG_EVENT_RULE_STATUS_UNSET) {
                loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
        status = lttng_event_rule_log4j_logging_get_log_level_rule(rule, &log_level_rule);
        if (status == LTTNG_EVENT_RULE_STATUS_UNSET) {
                loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;

-               loglevel_value = 0;
+               loglevel_value = LTTNG_LOGLEVEL_LOG4J_ALL;

        } else if (status == LTTNG_EVENT_RULE_STATUS_OK) {
                enum lttng_log_level_rule_status llr_status;
 
        } else if (status == LTTNG_EVENT_RULE_STATUS_OK) {
                enum lttng_log_level_rule_status llr_status;
 


@@ -809,8 +809,8 @@ end:
 static bool log_level_rule_valid(const struct lttng_log_level_rule *rule __attribute__((unused)))
 {
        /*
 static bool log_level_rule_valid(const struct lttng_log_level_rule *rule __attribute__((unused)))
 {
        /*

-        * For both LOG4J custom log level are possible and can
-        * span the entire int32 range.
+        * LOG4J custom log levels are possible and can span the entire int32
+        * range.

         */
        return true;
 }
         */
        return true;
 }