fix one bug after fix warning

pull/59/head
liquanqing 7 years ago
parent bc1e9da659
commit 249c59f640

@ -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;

@ -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) {

Loading…
Cancel
Save