forked from len0rd/rockbox
tagcache, coverity cleanup, Add TAGS_ALL_COUNT
Change-Id: Ia880c921a00b603aa4ba81b0c0670ed00491e41a
This commit is contained in:
parent
6b360d8b04
commit
1bcb1e39ee
2 changed files with 7 additions and 5 deletions
|
|
@ -443,7 +443,7 @@ static int open_master_fd(struct master_header *hdr, bool write)
|
|||
|
||||
/* Check the header. */
|
||||
rc = read(fd, hdr, sizeof(struct master_header));
|
||||
if (hdr->tch.magic == TAGCACHE_MAGIC && rc == sizeof(struct master_header))
|
||||
if (rc == sizeof(struct master_header) && hdr->tch.magic == TAGCACHE_MAGIC)
|
||||
{
|
||||
/* Success. */
|
||||
return fd;
|
||||
|
|
@ -453,7 +453,7 @@ static int open_master_fd(struct master_header *hdr, bool write)
|
|||
lseek(fd, 0, SEEK_SET);
|
||||
|
||||
rc = ecread(fd, hdr, 1, master_header_ec, true);
|
||||
if (hdr->tch.magic != TAGCACHE_MAGIC || rc != sizeof(struct master_header))
|
||||
if (rc != sizeof(struct master_header) || hdr->tch.magic != TAGCACHE_MAGIC)
|
||||
{
|
||||
logf("header error");
|
||||
tc_stat.ready = false;
|
||||
|
|
@ -3935,13 +3935,13 @@ static void fix_ramcache(void* old_addr, void* new_addr)
|
|||
|
||||
static int move_cb(int handle, void* current, void* new)
|
||||
{
|
||||
(void)handle;
|
||||
if (tcramcache.move_lock > 0)
|
||||
return BUFLIB_CB_CANNOT_MOVE;
|
||||
|
||||
fix_ramcache(current, new);
|
||||
tcramcache.hdr = new;
|
||||
return BUFLIB_CB_OK;
|
||||
(void)handle;
|
||||
}
|
||||
|
||||
static struct buflib_callbacks ops = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue