len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tagcache: fix logf format specifier mismatch

Browse source 
Mostly replace "%ld" with "%" PRId32 for int32_t,
or add casts to improve portability and prevent
incorrectly displayed values on some systems.

NB: (Some of) the log output is also presented
to the user in the db_commit plugin.

Change-Id: I98f663b35fec682c98f8a065253ee0c9bd34b61b
This commit is contained in:
Christian Soffke 2024-12-02 06:15:15 +01:00
parent 77888b0f24
commit 2ce1a1e638
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
apps/tagcache.c
View file

@ -946,7 +946,7 @@ static long find_entry_disk(const char *filename_raw, bool localfd)
} }
idx = -4; idx = -4;
} }
if (fd != filenametag_fd || localfd) if (fd != filenametag_fd || localfd)
close(fd); close(fd);
@ -1227,7 +1227,7 @@ static long tc_find_tag(int tag, int idx_id, const struct index_entry *idx)
if (result >= 0) if (result >= 0)
{ {
logf("tc_find_tag: Recovered tag %d value %lX from write queue", logf("tc_find_tag: Recovered tag %d value %lX from write queue",
tag, result); tag, (unsigned long) result);
return result; return result;
} }
} }
@ -1978,7 +1978,7 @@ static bool get_next(struct tagcache_search *tcs, bool is_numeric, char *buf, lo
case e_TAG_TOOLONG: case e_TAG_TOOLONG:
tcs->valid = false; tcs->valid = false;
logf("too long tag #2"); logf("too long tag #2");
logf("P:%lX/%lX", tcs->position, entry.tag_length); logf("P:%lX/%" PRIX32, (unsigned long) tcs->position, entry.tag_length);
return false; return false;
case e_TAG_SIZEMISMATCH: case e_TAG_SIZEMISMATCH:
tcs->valid = false; tcs->valid = false;
@ -2098,7 +2098,7 @@ bool tagcache_fill_tags(struct mp3entry *id3, const char *filename)
return false; return false;
entry = &tcramcache.hdr->indices[idx_id]; entry = &tcramcache.hdr->indices[idx_id];
char* buf = id3->id3v2buf; char* buf = id3->id3v2buf;
ssize_t remaining = sizeof(id3->id3v2buf); ssize_t remaining = sizeof(id3->id3v2buf);
@ -2410,7 +2410,7 @@ static bool tempbuf_insert(char *str, int id, int idx_id, bool unique)
tempbuf_left -= len; tempbuf_left -= len;
if (tempbuf_left - 4 < 0 || tempbufidx >= commit_entry_count) if (tempbuf_left - 4 < 0 || tempbufidx >= commit_entry_count)
{ {
logf("temp buf error rem: %ld idx: %d / %d", logf("temp buf error rem: %ld idx: %ld / %ld",
tempbuf_left, tempbufidx, commit_entry_count-1); tempbuf_left, tempbufidx, commit_entry_count-1);
return false; return false;
} }
@ -2791,7 +2791,7 @@ static bool build_numeric_indices(struct tagcache_header *h, int tmpfd)
} }
entries_processed += count; entries_processed += count;
logf("%d/%ld entries processed", entries_processed, h->entry_count); logf("%d/%" PRId32 " entries processed", entries_processed, h->entry_count);
} }
close(masterfd); close(masterfd);
@ -2835,7 +2835,7 @@ static int build_index(int index_type, struct tagcache_header *h, int tmpfd)
fd = open_tag_fd(&tch, index_type, true); fd = open_tag_fd(&tch, index_type, true);
if (fd >= 0) if (fd >= 0)
{ {
logf("tch.datasize=%ld", tch.datasize); logf("tch.datasize=%" PRId32, tch.datasize);
lookup_buffer_depth = 1 + lookup_buffer_depth = 1 +
/* First part */ commit_entry_count + /* First part */ commit_entry_count +
/* Second part */ (tch.datasize / TAGFILE_ENTRY_CHUNK_LENGTH); /* Second part */ (tch.datasize / TAGFILE_ENTRY_CHUNK_LENGTH);
@ -3150,7 +3150,7 @@ static int build_index(int index_type, struct tagcache_header *h, int tmpfd)
if (idxbuf[j].tag_seek[index_type] < 0) if (idxbuf[j].tag_seek[index_type] < 0)
{ {
logf("update error: %ld/%d/%ld", logf("update error: %" PRId32 "/%d/%" PRId32,
idxbuf[j].flag, i+j, tcmh.tch.entry_count); idxbuf[j].flag, i+j, tcmh.tch.entry_count);
error = true; error = true;
goto error_exit; goto error_exit;
@ -3223,7 +3223,7 @@ static int build_index(int index_type, struct tagcache_header *h, int tmpfd)
{ {
logf("too long entry!"); logf("too long entry!");
logf("length=%d", entry.tag_length[index_type]); logf("length=%d", entry.tag_length[index_type]);
logf("pos=0x%02lx", lseek(tmpfd, 0, SEEK_CUR)); logf("pos=0x%02lx", (unsigned long) lseek(tmpfd, 0, SEEK_CUR));
error = true; error = true;
break ; break ;
} }
@ -3233,7 +3233,7 @@ static int build_index(int index_type, struct tagcache_header *h, int tmpfd)
entry.tag_length[index_type]) entry.tag_length[index_type])
{ {
logf("read fail #8"); logf("read fail #8");
logf("offset=0x%02lx", entry.tag_offset[index_type]); logf("offset=0x%02" PRIx32, entry.tag_offset[index_type]);
logf("length=0x%02x", entry.tag_length[index_type]); logf("length=0x%02x", entry.tag_length[index_type]);
error = true; error = true;
break ; break ;
@ -3286,7 +3286,7 @@ static int build_index(int index_type, struct tagcache_header *h, int tmpfd)
if (index_type != tag_filename) if (index_type != tag_filename)
h->datasize += tch.datasize; h->datasize += tch.datasize;
logf("s:%d/%ld/%ld", index_type, tch.datasize, h->datasize); logf("s:%d/%" PRId32 "/%" PRId32, index_type, tch.datasize, h->datasize);
error_exit: error_exit:
close(fd); close(fd);
@ -3323,7 +3323,7 @@ static bool commit(void)
logf("canceling commit"); logf("canceling commit");
tc_stat.commit_delayed = true; tc_stat.commit_delayed = true;
close(fd); close(fd);
tmpfd = -1; tmpfd = -1;
} }
else else
#endif /*!defined(PLUGIN)*/ #endif /*!defined(PLUGIN)*/
@ -3408,7 +3408,7 @@ static bool commit(void)
goto commit_error; goto commit_error;
} }
logf("commit %ld entries...", tch.entry_count); logf("commit %" PRId32 " entries...", tch.entry_count);
/* Mark DB dirty so it will stay disabled if commit fails. */ /* Mark DB dirty so it will stay disabled if commit fails. */
current_tcmh.dirty = true; current_tcmh.dirty = true;
@ -3746,7 +3746,7 @@ static bool read_tag(char *dest, long size,
return false; return false;
} }
str_setlen(current_tag, pos); str_setlen(current_tag, pos);
/* Read in tag data */ /* Read in tag data */
@ -3787,7 +3787,7 @@ static bool read_tag(char *dest, long size,
dest[pos] = *(src++); dest[pos] = *(src++);
} }
str_setlen(dest, pos); str_setlen(dest, pos);
if (!strcasecmp(tagstr, current_tag)) if (!strcasecmp(tagstr, current_tag))
return true; return true;
@ -3895,7 +3895,7 @@ bool tagcache_import_changelog(void)
write_lock++; write_lock++;
filenametag_fd = open_tag_fd(&tch, tag_filename, false); filenametag_fd = open_tag_fd(&tch, tag_filename, false);
fast_readline(clfd, buf, bufsz, (void *)(intptr_t)masterfd, fast_readline(clfd, buf, bufsz, (void *)(intptr_t)masterfd,
parse_changelog_line); parse_changelog_line);
@ -4158,7 +4158,7 @@ static bool delete_entry(long idx_id)
{ {
struct tagfile_entry *tagentry = struct tagfile_entry *tagentry =
(struct tagfile_entry *)&tcramcache.hdr->tags[tag][oldseek]; (struct tagfile_entry *)&tcramcache.hdr->tags[tag][oldseek];
str_setlen(tagentry->tag_data, 0); str_setlen(tagentry->tag_data, 0);
} }
#endif /* HAVE_TC_RAMCACHE */ #endif /* HAVE_TC_RAMCACHE */
@ -4516,8 +4516,8 @@ static bool load_tagcache(void)
if (idx->tag_seek[tag] != pos) if (idx->tag_seek[tag] != pos)
{ {
logf("corrupt data structures!:"); logf("corrupt data structures!:");
logf(" tag_seek[%d]=%ld:pos=%ld", tag, logf(" tag_seek[%d]=%" PRId32 ":pos=%ld", tag,
idx->tag_seek[tag], pos); idx->tag_seek[tag], (long) pos);
goto failure; goto failure;
} }
} }
@ -4574,8 +4574,8 @@ static bool load_tagcache(void)
if (bytesleft < 0) if (bytesleft < 0)
{ {
logf("too big tagcache #2"); logf("too big tagcache #2");
logf("tl: %ld", fe->tag_length); logf("tl: %" PRId32, fe->tag_length);
logf("bl: %ld", bytesleft); logf("bl: %ld", (long) bytesleft);
goto failure; goto failure;
} }
@ -4587,8 +4587,8 @@ static bool load_tagcache(void)
{ {
logf("read error #13"); logf("read error #13");
logf("rc=0x%04x", (unsigned int)rc); // 0x431 logf("rc=0x%04x", (unsigned int)rc); // 0x431
logf("len=0x%04lx", fe->tag_length); // 0x4000 logf("len=0x%04" PRIx32, fe->tag_length); // 0x4000
logf("pos=0x%04lx", lseek(fd, 0, SEEK_CUR)); // 0x433 logf("pos=0x%04lx", (unsigned long) lseek(fd, 0, SEEK_CUR)); // 0x433
logf("tag=0x%02x", tag); // 0x00 logf("tag=0x%02x", tag); // 0x00
goto failure; goto failure;
} }
@ -4625,7 +4625,7 @@ static bool check_file_refs(bool auto_update)
const int bufsz = sizeof(buf); const int bufsz = sizeof(buf);
struct tagfile_entry tfe; struct tagfile_entry tfe;
struct tagcache_header hdr; struct tagcache_header hdr;
logf("reverse scan..."); logf("reverse scan...");
#ifdef HAVE_DIRCACHE #ifdef HAVE_DIRCACHE
@ -4707,7 +4707,7 @@ static bool check_file_refs(bool auto_update)
#endif /* HAVE_DIRCACHE */ #endif /* HAVE_DIRCACHE */
{ {
logf("Entry no longer valid."); logf("Entry no longer valid.");
logf("-> %s / %ld", buf, tfe.tag_length); logf("-> %s / %" PRId32, buf, tfe.tag_length);
delete_entry(idx_id); delete_entry(idx_id);
} }