X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fuser-tracepoint.cpp;fp=src%2Fcommon%2Fevent-rule%2Fuser-tracepoint.cpp;h=20993e12b397b36e1dc41d5feae78e0ab515bfc8;hp=39018f5a3e9cdaded1a177a02980f54ba3bc4971;hb=cd9adb8b829564212158943a0d279bb35322ab30;hpb=e665dfbce25215d5ec77ff03a279c7163b337db1 diff --git a/src/common/event-rule/user-tracepoint.cpp b/src/common/event-rule/user-tracepoint.cpp index 39018f5a3..20993e12b 100644 --- a/src/common/event-rule/user-tracepoint.cpp +++ b/src/common/event-rule/user-tracepoint.cpp @@ -29,7 +29,7 @@ static void lttng_event_rule_user_tracepoint_destroy(struct lttng_event_rule *ru { struct lttng_event_rule_user_tracepoint *tracepoint; - if (rule == NULL) { + if (rule == nullptr) { return; } @@ -95,7 +95,7 @@ static int lttng_event_rule_user_tracepoint_serialize(const struct lttng_event_r pattern_len = strlen(tracepoint->pattern) + 1; - if (tracepoint->filter_expression != NULL) { + if (tracepoint->filter_expression != nullptr) { filter_expression_len = strlen(tracepoint->filter_expression) + 1; } else { filter_expression_len = 0; @@ -253,7 +253,7 @@ lttng_event_rule_user_tracepoint_generate_filter_bytecode(struct lttng_event_rul struct lttng_event_rule_user_tracepoint *tracepoint; enum lttng_event_rule_status status; const char *filter; - struct lttng_bytecode *bytecode = NULL; + struct lttng_bytecode *bytecode = nullptr; LTTNG_ASSERT(rule); @@ -261,7 +261,7 @@ lttng_event_rule_user_tracepoint_generate_filter_bytecode(struct lttng_event_rul status = lttng_event_rule_user_tracepoint_get_filter(rule, &filter); if (status == LTTNG_EVENT_RULE_STATUS_UNSET) { - filter = NULL; + filter = nullptr; } else if (status != LTTNG_EVENT_RULE_STATUS_OK) { ret_code = LTTNG_ERR_FILTER_INVAL; goto end; @@ -274,15 +274,15 @@ lttng_event_rule_user_tracepoint_generate_filter_bytecode(struct lttng_event_rul if (filter) { tracepoint->internal_filter.filter = strdup(filter); - if (tracepoint->internal_filter.filter == NULL) { + if (tracepoint->internal_filter.filter == nullptr) { ret_code = LTTNG_ERR_NOMEM; goto error; } } else { - tracepoint->internal_filter.filter = NULL; + tracepoint->internal_filter.filter = nullptr; } - if (tracepoint->internal_filter.filter == NULL) { + if (tracepoint->internal_filter.filter == nullptr) { ret_code = LTTNG_OK; goto end; } @@ -294,7 +294,7 @@ lttng_event_rule_user_tracepoint_generate_filter_bytecode(struct lttng_event_rul } tracepoint->internal_filter.bytecode = bytecode; - bytecode = NULL; + bytecode = nullptr; ret_code = LTTNG_OK; error: @@ -339,7 +339,7 @@ lttng_event_rule_user_tracepoint_generate_exclusions(const struct lttng_event_ru LTTNG_ASSERT(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK); if (nb_exclusions == 0) { /* Nothing to do. */ - exclusions = NULL; + exclusions = nullptr; ret_status = LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE; goto end; } @@ -367,7 +367,7 @@ lttng_event_rule_user_tracepoint_generate_exclusions(const struct lttng_event_ru sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusions, i))); if (copy_ret) { free(exclusions); - exclusions = NULL; + exclusions = nullptr; ret_status = LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_ERROR; goto end; } @@ -427,9 +427,9 @@ lttng_event_rule_user_tracepoint_mi_serialize(const struct lttng_event_rule *rul int ret; enum lttng_error_code ret_code; enum lttng_event_rule_status status; - const char *filter = NULL; - const char *name_pattern = NULL; - const struct lttng_log_level_rule *log_level_rule = NULL; + const char *filter = nullptr; + const char *name_pattern = nullptr; + const struct lttng_log_level_rule *log_level_rule = nullptr; unsigned int exclusion_count = 0; LTTNG_ASSERT(rule); @@ -466,7 +466,7 @@ lttng_event_rule_user_tracepoint_mi_serialize(const struct lttng_event_rule *rul } /* Filter expression. */ - if (filter != NULL) { + if (filter != nullptr) { ret = mi_lttng_writer_write_element_string( writer, mi_lttng_element_event_rule_filter_expression, filter); if (ret) { @@ -534,7 +534,7 @@ end: struct lttng_event_rule *lttng_event_rule_user_tracepoint_create(void) { - struct lttng_event_rule *rule = NULL; + struct lttng_event_rule *rule = nullptr; struct lttng_event_rule_user_tracepoint *tp_rule; enum lttng_event_rule_status status; @@ -559,9 +559,9 @@ struct lttng_event_rule *lttng_event_rule_user_tracepoint_create(void) tp_rule->parent.mi_serialize = lttng_event_rule_user_tracepoint_mi_serialize; /* Not necessary for now. */ - tp_rule->parent.generate_lttng_event = NULL; + tp_rule->parent.generate_lttng_event = nullptr; - tp_rule->log_level_rule = NULL; + tp_rule->log_level_rule = nullptr; lttng_dynamic_pointer_array_init(&tp_rule->exclusions, destroy_lttng_exclusions_element); @@ -569,7 +569,7 @@ struct lttng_event_rule *lttng_event_rule_user_tracepoint_create(void) status = lttng_event_rule_user_tracepoint_set_name_pattern(rule, "*"); if (status != LTTNG_EVENT_RULE_STATUS_OK) { lttng_event_rule_destroy(rule); - rule = NULL; + rule = nullptr; } end: @@ -584,13 +584,13 @@ ssize_t lttng_event_rule_user_tracepoint_create_from_payload(struct lttng_payloa enum lttng_event_rule_status status; const struct lttng_event_rule_user_tracepoint_comm *tracepoint_comm; const char *pattern; - const char *filter_expression = NULL; - const char **exclusions = NULL; + const char *filter_expression = nullptr; + const char **exclusions = nullptr; const uint32_t *exclusion_len; const char *exclusion; struct lttng_buffer_view current_buffer_view; - struct lttng_event_rule *rule = NULL; - struct lttng_log_level_rule *log_level_rule = NULL; + struct lttng_event_rule *rule = nullptr; + struct lttng_log_level_rule *log_level_rule = nullptr; if (!_event_rule) { ret = -1; @@ -747,7 +747,7 @@ skip_log_level_rule: } *_event_rule = rule; - rule = NULL; + rule = nullptr; ret = offset; end: free(exclusions); @@ -760,7 +760,7 @@ enum lttng_event_rule_status lttng_event_rule_user_tracepoint_set_name_pattern(struct lttng_event_rule *rule, const char *pattern) { - char *pattern_copy = NULL; + char *pattern_copy = nullptr; struct lttng_event_rule_user_tracepoint *tracepoint; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; @@ -782,7 +782,7 @@ lttng_event_rule_user_tracepoint_set_name_pattern(struct lttng_event_rule *rule, free(tracepoint->pattern); tracepoint->pattern = pattern_copy; - pattern_copy = NULL; + pattern_copy = nullptr; end: return status; } @@ -813,7 +813,7 @@ end: enum lttng_event_rule_status lttng_event_rule_user_tracepoint_set_filter(struct lttng_event_rule *rule, const char *expression) { - char *expression_copy = NULL; + char *expression_copy = nullptr; struct lttng_event_rule_user_tracepoint *tracepoint; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; @@ -836,7 +836,7 @@ lttng_event_rule_user_tracepoint_set_filter(struct lttng_event_rule *rule, const } tracepoint->filter_expression = expression_copy; - expression_copy = NULL; + expression_copy = nullptr; end: return status; } @@ -903,7 +903,7 @@ enum lttng_event_rule_status lttng_event_rule_user_tracepoint_set_log_level_rule { struct lttng_event_rule_user_tracepoint *tracepoint; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; - struct lttng_log_level_rule *copy = NULL; + struct lttng_log_level_rule *copy = nullptr; if (!rule || !IS_USER_TRACEPOINT_EVENT_RULE(rule)) { status = LTTNG_EVENT_RULE_STATUS_INVALID; @@ -918,7 +918,7 @@ enum lttng_event_rule_status lttng_event_rule_user_tracepoint_set_log_level_rule } copy = lttng_log_level_rule_copy(log_level_rule); - if (copy == NULL) { + if (copy == nullptr) { status = LTTNG_EVENT_RULE_STATUS_ERROR; goto end; } @@ -945,7 +945,7 @@ enum lttng_event_rule_status lttng_event_rule_user_tracepoint_get_log_level_rule } tracepoint = lttng::utils::container_of(rule, <tng_event_rule_user_tracepoint::parent); - if (tracepoint->log_level_rule == NULL) { + if (tracepoint->log_level_rule == nullptr) { status = LTTNG_EVENT_RULE_STATUS_UNSET; goto end; } @@ -960,7 +960,7 @@ lttng_event_rule_user_tracepoint_add_name_pattern_exclusion(struct lttng_event_r const char *exclusion) { int ret; - char *exclusion_copy = NULL; + char *exclusion_copy = nullptr; struct lttng_event_rule_user_tracepoint *tracepoint; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; @@ -988,7 +988,7 @@ lttng_event_rule_user_tracepoint_add_name_pattern_exclusion(struct lttng_event_r goto end; } - exclusion_copy = NULL; + exclusion_copy = nullptr; end: free(exclusion_copy); return status;