From 249c59f6401155c1702e7fbae83822e7db8e61bc Mon Sep 17 00:00:00 2001 From: liquanqing Date: Tue, 30 Apr 2019 16:53:49 +0800 Subject: [PATCH] fix one bug after fix warning --- .../plugins/types/struct2json/src/cJSON.c | 23 ++----------------- easyflash/src/ef_log.c | 4 ++-- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/easyflash/plugins/types/struct2json/src/cJSON.c b/easyflash/plugins/types/struct2json/src/cJSON.c index 6210fa7..4e3e480 100644 --- a/easyflash/plugins/types/struct2json/src/cJSON.c +++ b/easyflash/plugins/types/struct2json/src/cJSON.c @@ -276,27 +276,8 @@ static char *print_string_ptr(const char *str,printbuffer *p) strcpy(out,"\"\""); return out; } - - ptr=str; -#if 0 - while ((token=*ptr) && ++len) - { - if (strchr("\"\\\b\f\n\r\t",token)) - len++; - else if (token<32) - len+=5; - ptr++; - } -#else - do { - token=*ptr; - if (strchr("\"\\\b\f\n\r\t",token)) - len++; - else if (token<32) - len+=5; - ptr++; - } while (token && ++len); -#endif + ptr=str;while ((token=*ptr) && ++len) {if (strchr("\"\\\b\f\n\r\t",token)) len++; else if (token<32) len+=5;ptr++;} + if (p) out=ensure(p,len+3); else out=(char*)cJSON_malloc(len+3); if (!out) return 0; diff --git a/easyflash/src/ef_log.c b/easyflash/src/ef_log.c index d69affd..6d31d38 100644 --- a/easyflash/src/ef_log.c +++ b/easyflash/src/ef_log.c @@ -124,7 +124,7 @@ static SectorStatus get_sector_status(uint32_t addr) { uint32_t status_full_magic = 0, status_use_magic = 0; /* calculate the sector header address */ - header_addr = addr / EF_ERASE_MIN_SIZE * EF_ERASE_MIN_SIZE; + header_addr = addr & (~(EF_ERASE_MIN_SIZE - 1)); if (ef_port_read(header_addr, header_buf, sizeof(header_buf)) == EF_NO_ERR) { sector_header_magic = header_buf[SECTOR_HEADER_MAGIC_INDEX]; @@ -164,7 +164,7 @@ static EfErrCode write_sector_status(uint32_t addr, SectorStatus status) { uint32_t header, header_addr = 0; /* calculate the sector header address */ - header_addr = addr / EF_ERASE_MIN_SIZE * EF_ERASE_MIN_SIZE; + header_addr = addr & (~(EF_ERASE_MIN_SIZE - 1)); /* calculate the sector staus magic */ switch (status) {