Add type-checked versions of allocation and deallocations functions

[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 25f2c4c0e7ee5d5344bc228a018262365f0af3e6..b7386c0ba36f99743055efff6c0ff5a8b04d954e 100644 (file)
--- a/src/common/event-rule/log4j-logging.cpp
+++ b/src/common/event-rule/log4j-logging.cpp
@@ -5,19 +5,19 @@
  *
  */
 
-#include <common/credentials.h>
-#include <common/error.h>
-#include <common/hashtable/hashtable.h>
-#include <common/hashtable/utils.h>
-#include <common/macros.h>
-#include <common/mi-lttng.h>
-#include <common/optional.h>
-#include <common/payload-view.h>
-#include <common/payload.h>
-#include <common/runas.h>
-#include <common/string-utils/string-utils.h>
-#include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/log4j-logging-internal.h>
+#include <common/credentials.hpp>
+#include <common/error.hpp>
+#include <common/hashtable/hashtable.hpp>
+#include <common/hashtable/utils.hpp>
+#include <common/macros.hpp>
+#include <common/mi-lttng.hpp>
+#include <common/optional.hpp>
+#include <common/payload-view.hpp>
+#include <common/payload.hpp>
+#include <common/runas.hpp>
+#include <common/string-utils/string-utils.hpp>
+#include <lttng/event-rule/event-rule-internal.hpp>
+#include <lttng/event-rule/log4j-logging-internal.hpp>
 #include <lttng/event.h>
 #include <lttng/log-level-rule.h>
 
@@ -376,7 +376,7 @@ lttng_event_rule_log4j_logging_get_internal_filter_bytecode(
 
 static enum lttng_event_rule_generate_exclusions_status
 lttng_event_rule_log4j_logging_generate_exclusions(
-               const struct lttng_event_rule *rule,
+               const struct lttng_event_rule *rule __attribute__((unused)),
                struct lttng_event_exclusion **_exclusions)
 {
        /* Unsupported. */
@@ -421,7 +421,7 @@ static struct lttng_event *lttng_event_rule_log4j_logging_generate_lttng_event(
        log4j_logging = container_of(
                        rule, const struct lttng_event_rule_log4j_logging, parent);
 
-       local_event = (lttng_event *) zmalloc(sizeof(*local_event));
+       local_event = zmalloc<lttng_event>();
        if (!local_event) {
                goto error;
        }
@@ -560,7 +560,7 @@ struct lttng_event_rule *lttng_event_rule_log4j_logging_create(void)
        struct lttng_event_rule_log4j_logging *tp_rule;
        enum lttng_event_rule_status status;
 
-       tp_rule = (lttng_event_rule_log4j_logging *) zmalloc(sizeof(struct lttng_event_rule_log4j_logging));
+       tp_rule = zmalloc<lttng_event_rule_log4j_logging>();
        if (!tp_rule) {
                goto end;
        }
@@ -849,7 +849,8 @@ end:
        return status;
 }
 
-static bool log_level_rule_valid(const struct lttng_log_level_rule *rule)
+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