goto end;
}
- bt_object_init(query_exec, bt_query_executor_destroy);
+ bt_object_init_shared(&query_exec->base,
+ bt_query_executor_destroy);
BT_LOGD("Created query executor: addr=%p", query_exec);
end:
BT_LOGD("User method returned: status=%s, result-addr=%p",
bt_query_status_string(ret.status), ret.result);
if (query_exec->canceled) {
- BT_PUT(ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(ret.result);
ret.status = BT_QUERY_STATUS_EXECUTOR_CANCELED;
goto end;
} else {
* The user cannot decide that the executor is
* canceled if it's not.
*/
- BT_PUT(ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(ret.result);
ret.status = BT_QUERY_STATUS_ERROR;
goto end;
}
* This is reserved for invalid parameters passed to
* this function.
*/
- BT_PUT(ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(ret.result);
ret.status = BT_QUERY_STATUS_ERROR;
break;
case BT_QUERY_STATUS_OK:
BT_LOGW("User method did not return BT_QUERY_STATUS_OK, but result is not NULL: "
"status=%s, result-addr=%p",
bt_query_status_string(ret.status), ret.result);
- BT_PUT(ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(ret.result);
}
}
ret.result = NULL;
}
- bt_put(ret.result);
+ bt_object_put_ref(ret.result);
return ret.status;
}