X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Flog4j-logging.c;h=03c4df8a385ece2ebd87b845a33c618f4f7acca0;hp=755ae26c626c4afc045b603d2f37bf357ee68389;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hpb=cc3b9644f017a91d347d7a414387292e3175635e

diff --git a/src/common/event-rule/log4j-logging.c b/src/common/event-rule/log4j-logging.c
index 755ae26c6..03c4df8a3 100644
--- a/src/common/event-rule/log4j-logging.c
+++ b/src/common/event-rule/log4j-logging.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include <assert.h>
 #include <common/credentials.h>
 #include <common/error.h>
 #include <common/hashtable/hashtable.h>
@@ -152,8 +151,8 @@ static bool lttng_event_rule_log4j_logging_is_equal(
 	}
 
 	/* Long check. */
-	assert(a->pattern);
-	assert(b->pattern);
+	LTTNG_ASSERT(a->pattern);
+	LTTNG_ASSERT(b->pattern);
 	if (strcmp(a->pattern, b->pattern)) {
 		goto end;
 	}
@@ -195,8 +194,8 @@ static int generate_agent_filter(
 	const struct lttng_log_level_rule *log_level_rule = NULL;
 	enum lttng_event_rule_status status;
 
-	assert(rule);
-	assert(_agent_filter);
+	LTTNG_ASSERT(rule);
+	LTTNG_ASSERT(_agent_filter);
 
 	status = lttng_event_rule_log4j_logging_get_name_pattern(rule, &pattern);
 	if (status != LTTNG_EVENT_RULE_STATUS_OK) {
@@ -303,7 +302,7 @@ lttng_event_rule_log4j_logging_generate_filter_bytecode(
 	struct lttng_bytecode *bytecode = NULL;
 	char *agent_filter;
 
-	assert(rule);
+	LTTNG_ASSERT(rule);
 
 	log4j_logging = container_of(
 			rule, struct lttng_event_rule_log4j_logging, parent);
@@ -357,7 +356,7 @@ static const char *lttng_event_rule_log4j_logging_get_internal_filter(
 {
 	struct lttng_event_rule_log4j_logging *log4j_logging;
 
-	assert(rule);
+	LTTNG_ASSERT(rule);
 	log4j_logging = container_of(
 			rule, struct lttng_event_rule_log4j_logging, parent);
 	return log4j_logging->internal_filter.filter;
@@ -369,7 +368,7 @@ lttng_event_rule_log4j_logging_get_internal_filter_bytecode(
 {
 	struct lttng_event_rule_log4j_logging *log4j_logging;
 
-	assert(rule);
+	LTTNG_ASSERT(rule);
 	log4j_logging = container_of(
 			rule, struct lttng_event_rule_log4j_logging, parent);
 	return log4j_logging->internal_filter.bytecode;
@@ -489,22 +488,22 @@ static enum lttng_error_code lttng_event_rule_log4j_logging_mi_serialize(
 	const char *name_pattern = NULL;
 	const struct lttng_log_level_rule *log_level_rule = NULL;
 
-	assert(rule);
-	assert(writer);
-	assert(IS_LOG4J_LOGGING_EVENT_RULE(rule));
+	LTTNG_ASSERT(rule);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(IS_LOG4J_LOGGING_EVENT_RULE(rule));
 
 	status = lttng_event_rule_log4j_logging_get_name_pattern(
 			rule, &name_pattern);
-	assert(status == LTTNG_EVENT_RULE_STATUS_OK);
-	assert(name_pattern);
+	LTTNG_ASSERT(status == LTTNG_EVENT_RULE_STATUS_OK);
+	LTTNG_ASSERT(name_pattern);
 
 	status = lttng_event_rule_log4j_logging_get_filter(rule, &filter);
-	assert(status == LTTNG_EVENT_RULE_STATUS_OK ||
+	LTTNG_ASSERT(status == LTTNG_EVENT_RULE_STATUS_OK ||
 			status == LTTNG_EVENT_RULE_STATUS_UNSET);
 
 	status = lttng_event_rule_log4j_logging_get_log_level_rule(
 			rule, &log_level_rule);
-	assert(status == LTTNG_EVENT_RULE_STATUS_OK ||
+	LTTNG_ASSERT(status == LTTNG_EVENT_RULE_STATUS_OK ||
 			status == LTTNG_EVENT_RULE_STATUS_UNSET);
 
 	/* Open event rule log4j logging element. */
@@ -697,7 +696,7 @@ skip_filter_expression:
 			goto end;
 		}
 
-		assert(ret == log4j_logging_comm->log_level_rule_len);
+		LTTNG_ASSERT(ret == log4j_logging_comm->log_level_rule_len);
 	}
 
 	/* Skip after the log level rule. */