storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add printf attribute to log_err/DPRINTF and fix a few warnings

Browse Source 
Modified to not use %z for portability reasons.
This commit is contained in:
Catalin Patulea
2014-03-14 00:36:30 -04:00
committed by Justin Maggard
parent 45cf9208fb
commit 3a57744735
11 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tagutils/tagutils-asf.c
View File

@ -567,7 +567,8 @@ _get_asffileinfo(char *file, struct song_metadata *psong)
if(pos + tmp.Size > hdr.Size)
{
DPRINTF(E_ERROR, L_SCANNER, "Size overrun reading header object %I64x\n", tmp.Size);
DPRINTF(E_ERROR, L_SCANNER, "Size overrun reading header object %llu\n",
(unsigned long long)tmp.Size);
break;
}

7
tagutils/tagutils-misc.c
View File

@ -190,7 +190,12 @@ vc_scan(struct song_metadata *psong, const char *comment, const size_t length)
{
if( strncasecmp(comment, "LYRICS=", 7) != 0 )
{
DPRINTF(E_WARN, L_SCANNER, "Vorbis %.*s too long [%s]\n", (index(comment, '=')-comment), comment, psong->path);
const char *eq = strchr(comment, '=');
int len = 8;
if (eq)
len = eq - comment;
DPRINTF(E_WARN, L_SCANNER, "Vorbis %.*s too long [%s]\n",
len, comment, psong->path);
}
return;
}

6
tagutils/tagutils-ogg.c
View File

@ -179,9 +179,6 @@ _ogg_vorbis_process(ogg_stream_processor *stream, ogg_page *page,
ogg_int64_t gp = ogg_page_granulepos(page);
if(gp > 0)
{
if(gp < inf->lastgranulepos)
DPRINTF(E_WARN, L_SCANNER, "granulepos in stream %d decreases from %lld to %lld",
stream->num, inf->lastgranulepos, gp);
inf->lastgranulepos = gp;
}
else
@ -402,7 +399,8 @@ _ogg_get_next_page(FILE *f, ogg_sync_state *sync, ogg_page *page,
while((ret = ogg_sync_pageout(sync, page)) <= 0)
{
if(ret < 0)
DPRINTF(E_WARN, L_SCANNER, "Hole in data found at approximate offset %lld bytes. Corrupted ogg.\n", *written);
DPRINTF(E_WARN, L_SCANNER, "Hole in data found at approximate offset %lld bytes. Corrupted ogg.\n",
(long long)*written);
buffer = ogg_sync_buffer(sync, 4500); // chunk=4500
bytes = fread(buffer, 1, 4500, f);