From 6551f9cab20fd36148477b295e6af384231cc552 Mon Sep 17 00:00:00 2001 From: MacRsh Date: Sun, 27 Aug 2023 15:12:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=B1=A1=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/soft_timer.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/soft_timer.c b/src/soft_timer.c index c658182..c237716 100644 --- a/src/soft_timer.c +++ b/src/soft_timer.c @@ -63,15 +63,6 @@ mr_err_t mr_soft_timer_add(mr_soft_timer_t timer, const char *name, mr_soft_time return -MR_ERR_NO_MEMORY; } - /* Add the object to the container */ - ret = mr_object_add(&timer->object, name, Mr_Object_Type_SoftTimer); - if (ret != MR_ERR_OK) - { - MR_DEBUG_E(DEBUG_TAG, "%s add failed: %d\r\n", name, ret); - mr_free(memory); - return ret; - } - /* Initialize the private fields */ timer->table = table; timer->table_size = table_size; @@ -89,7 +80,15 @@ mr_err_t mr_soft_timer_add(mr_soft_timer_t timer, const char *name, mr_soft_time mr_list_init(&timer->data[count].timeout_list); } - return MR_ERR_OK; + /* Add the object to the container */ + ret = mr_object_add(&timer->object, name, Mr_Object_Type_SoftTimer); + if (ret != MR_ERR_OK) + { + MR_DEBUG_E(DEBUG_TAG, "%s add failed: %d\r\n", name, ret); + mr_free(memory); + } + + return ret; } /** @@ -122,7 +121,7 @@ mr_err_t mr_soft_timer_remove(mr_soft_timer_t timer) mr_free(timer->data); timer->data = MR_NULL; - return ret; + return MR_ERR_OK; } /**