Use compiler-agnostic defines to silence warning

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

diff --git a/src/common/event-rule/jul-logging.cpp b/src/common/event-rule/jul-logging.cpp
index 95b953e17bda9697d19418f8892f53c42545f27a..289349ca671b95a2ff5b14a49bf6b5186c4d8d63 100644 (file)
--- a/src/common/event-rule/jul-logging.cpp
+++ b/src/common/event-rule/jul-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);
-                       op = ">=";
+                       op = LTTNG_JUL_EVENT_RULE_AT_LEAST_AS_SEVERE_AS_OP;
                        break;
                default:
                        abort();
@@ -413,7 +413,7 @@ lttng_event_rule_jul_logging_generate_lttng_event(const struct lttng_event_rule
        status = lttng_event_rule_jul_logging_get_log_level_rule(rule, &log_level_rule);
        if (status == LTTNG_EVENT_RULE_STATUS_UNSET) {
                loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-               loglevel_value = -1;
+               loglevel_value = LTTNG_LOGLEVEL_JUL_ALL;
        } else if (status == LTTNG_EVENT_RULE_STATUS_OK) {
                enum lttng_log_level_rule_status llr_status;
 
@@ -810,8 +810,8 @@ end:
 static bool log_level_rule_valid(const struct lttng_log_level_rule *rule __attribute__((unused)))
 {
        /*
-        * For both JUL and LOG4J custom log level are possible and can
-        * span the entire int32 range.
+        * JUL custom log levels are possible and can span the entire int32
+        * range.
         */
        return true;
 }