X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fstop-session.cpp;fp=src%2Fcommon%2Factions%2Fstop-session.cpp;h=75ff1b84755b5ec682d712093d4990f082f472c0;hp=3cffb4a553b8a774684b0a438856273544609052;hb=64803277bbdbe0a943360d918298a48157d9da55;hpb=60f1b42d6280b6bd386abb726dca4fd3b31d8491 diff --git a/src/common/actions/stop-session.cpp b/src/common/actions/stop-session.cpp index 3cffb4a55..75ff1b847 100644 --- a/src/common/actions/stop-session.cpp +++ b/src/common/actions/stop-session.cpp @@ -291,7 +291,7 @@ end: struct lttng_action *lttng_action_stop_session_create(void) { - struct lttng_action *action = NULL; + struct lttng_action_stop_session *action_stop = NULL; struct lttng_rate_policy *policy = NULL; enum lttng_action_status status; @@ -301,12 +301,12 @@ struct lttng_action *lttng_action_stop_session_create(void) goto end; } - action = (lttng_action *) zmalloc(sizeof(struct lttng_action_stop_session)); - if (!action) { + action_stop = zmalloc(); + if (!action_stop) { goto end; } - lttng_action_init(action, LTTNG_ACTION_TYPE_STOP_SESSION, + lttng_action_init(&action_stop->parent, LTTNG_ACTION_TYPE_STOP_SESSION, lttng_action_stop_session_validate, lttng_action_stop_session_serialize, lttng_action_stop_session_is_equal, @@ -315,16 +315,17 @@ struct lttng_action *lttng_action_stop_session_create(void) lttng_action_generic_add_error_query_results, lttng_action_stop_session_mi_serialize); - status = lttng_action_stop_session_set_rate_policy(action, policy); + status = lttng_action_stop_session_set_rate_policy( + &action_stop->parent, policy); if (status != LTTNG_ACTION_STATUS_OK) { - free(action); - action = NULL; + lttng_action_destroy(&action_stop->parent); + action_stop = NULL; goto end; } end: lttng_rate_policy_destroy(policy); - return action; + return &action_stop->parent; } enum lttng_action_status lttng_action_stop_session_set_session_name(