From 7877c43aa92dc6be3da803751e68daf74fdf37a9 Mon Sep 17 00:00:00 2001 From: brand Date: Tue, 14 Jan 2020 11:54:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=90=88=E6=9C=80=E6=96=B0=E5=88=86?= =?UTF-8?q?=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easyflash/inc/easyflash.h | 2 +- easyflash/src/ef_env.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/easyflash/inc/easyflash.h b/easyflash/inc/easyflash.h index 1c3a214..365d186 100644 --- a/easyflash/inc/easyflash.h +++ b/easyflash/inc/easyflash.h @@ -66,7 +66,7 @@ void ef_env_iterator_to_first(void); char *ef_env_iterator_now_name(void); size_t ef_env_iterator_now_value_len(void); size_t ef_env_iterator_now_value(void *value_buf, size_t buf_len); -env_node_obj_t ef_env_iterator_next(size_t *value_len); +env_node_obj_t ef_env_iterator_next(void); #endif #ifdef EF_USING_IAP diff --git a/easyflash/src/ef_env.c b/easyflash/src/ef_env.c index 1295a8d..03e43ff 100644 --- a/easyflash/src/ef_env.c +++ b/easyflash/src/ef_env.c @@ -1419,8 +1419,7 @@ size_t f_env_iterator_now_value(void *value_buf, size_t buf_len) * @param value_len ENV blob buffer length * @return char* 0:Traversal complete nonzero:ENV */ -env_node_obj_t ef_env_iterator_next(size_t *value_len) -//char* ef_env_iterator_next(size_t *value_len) +env_node_obj_t ef_env_iterator_next() { uint32_t sec_addr; ef_port_env_lock(); @@ -1449,10 +1448,6 @@ _next: { _g_env_iter_obj.env.name[_g_env_iter_obj.env.name_len] = 0; - if(value_len) - { - *value_len = _g_env_iter_obj.env.value_len; - } ef_port_env_unlock(); return &_g_env_iter_obj.env; }