Skip to content

Commit

Permalink
Fix z_task_join signature (#704)
Browse files Browse the repository at this point in the history
  • Loading branch information
sashacmc authored Oct 2, 2024
1 parent 3567b4b commit 2b48da3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/zenoh-pico/system/platform_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ z_result_t _z_task_cancel(_z_task_t *task);
void _z_task_free(_z_task_t **task);

z_result_t z_task_init(z_owned_task_t *task, z_task_attr_t *attr, void *(*fun)(void *), void *arg);
z_result_t z_task_join(z_owned_task_t *task);
z_result_t z_task_join(z_moved_task_t *task);

/*------------------ Mutex ------------------*/
_Z_OWNED_TYPE_VALUE(_z_mutex_t, mutex)
Expand Down
4 changes: 2 additions & 2 deletions src/system/platform_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ z_result_t z_task_init(z_owned_task_t *task, z_task_attr_t *attr, void *(*fun)(v
return _z_task_init(&task->_val, attr, fun, arg);
}

z_result_t z_task_join(z_owned_task_t *task) {
_z_task_t *ptr = &task->_val;
z_result_t z_task_join(z_moved_task_t *task) {
_z_task_t *ptr = &task->_this._val;
z_result_t ret = _z_task_join(ptr);
_z_task_free(&ptr);
return ret;
Expand Down

0 comments on commit 2b48da3

Please sign in to comment.