X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Flog-level-rule.c;h=d2bbd4176d1aa27f1f2cbca7e3a55e13040f614c;hp=5c0da4d1a471118de60d968f7dc2d0771398cffc;hb=f895927f329180ca1e6f4426e9d3c6250ae698ba;hpb=6a751b953a43c566b74818ec6325db0978e16c66 diff --git a/src/common/log-level-rule.c b/src/common/log-level-rule.c index 5c0da4d1a..d2bbd4176 100644 --- a/src/common/log-level-rule.c +++ b/src/common/log-level-rule.c @@ -5,7 +5,6 @@ * */ -#include #include #include #include @@ -112,7 +111,6 @@ void lttng_log_level_rule_destroy(struct lttng_log_level_rule *log_level_rule) free(log_level_rule); } -LTTNG_HIDDEN ssize_t lttng_log_level_rule_create_from_payload( struct lttng_payload_view *view, struct lttng_log_level_rule **_rule) @@ -160,7 +158,6 @@ end: return ret; } -LTTNG_HIDDEN int lttng_log_level_rule_serialize(const struct lttng_log_level_rule *rule, struct lttng_payload *payload) { @@ -187,7 +184,6 @@ end: return ret; } -LTTNG_HIDDEN bool lttng_log_level_rule_is_equal(const struct lttng_log_level_rule *a, const struct lttng_log_level_rule *b) { @@ -224,13 +220,12 @@ end: return is_equal; } -LTTNG_HIDDEN struct lttng_log_level_rule *lttng_log_level_rule_copy( const struct lttng_log_level_rule *source) { struct lttng_log_level_rule *copy = NULL; - assert(source); + LTTNG_ASSERT(source); copy = zmalloc(sizeof(struct lttng_log_level_rule)); if (!copy) { @@ -243,13 +238,12 @@ end: return copy; } -LTTNG_HIDDEN void lttng_log_level_rule_to_loglevel( const struct lttng_log_level_rule *log_level_rule, enum lttng_loglevel_type *loglevel_type, int *loglevel_value) { - assert(log_level_rule); + LTTNG_ASSERT(log_level_rule); switch (log_level_rule->type) { case LTTNG_LOG_LEVEL_RULE_TYPE_EXACTLY: @@ -265,7 +259,6 @@ void lttng_log_level_rule_to_loglevel( *loglevel_value = log_level_rule->level; } -LTTNG_HIDDEN unsigned long lttng_log_level_rule_hash( const struct lttng_log_level_rule *log_level_rule) { @@ -274,7 +267,7 @@ unsigned long lttng_log_level_rule_hash( int log_level_value; enum lttng_log_level_rule_type type; - assert(log_level_rule); + LTTNG_ASSERT(log_level_rule); type = lttng_log_level_rule_get_type(log_level_rule); @@ -292,7 +285,7 @@ unsigned long lttng_log_level_rule_hash( break; } - assert(llr_status == LTTNG_LOG_LEVEL_RULE_STATUS_OK); + LTTNG_ASSERT(llr_status == LTTNG_LOG_LEVEL_RULE_STATUS_OK); hash = hash_key_ulong((void *) (unsigned long) type, lttng_ht_seed); @@ -302,7 +295,6 @@ unsigned long lttng_log_level_rule_hash( return hash; } -LTTNG_HIDDEN enum lttng_error_code lttng_log_level_rule_mi_serialize( const struct lttng_log_level_rule *rule, struct mi_writer *writer) @@ -313,8 +305,8 @@ enum lttng_error_code lttng_log_level_rule_mi_serialize( const char *element_str = NULL; int level; - assert(rule); - assert(writer); + LTTNG_ASSERT(rule); + LTTNG_ASSERT(writer); switch (lttng_log_level_rule_get_type(rule)) { case LTTNG_LOG_LEVEL_RULE_TYPE_EXACTLY: @@ -331,7 +323,7 @@ enum lttng_error_code lttng_log_level_rule_mi_serialize( break; } - assert(status == LTTNG_LOG_LEVEL_RULE_STATUS_OK); + LTTNG_ASSERT(status == LTTNG_LOG_LEVEL_RULE_STATUS_OK); /* Open log level rule element. */ ret = mi_lttng_writer_open_element(