philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use memcmp, rather than strncmp, in wavplay's validate_wav_header(),

Browse Source 
and avoid warnings about mismatched signedness.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@311 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-08-11 08:20:37 +00:00
parent c7cefb1c05
commit ca7f9c6b86
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dll/wavplay/wavplay.c
View File

@@ -46,13 +46,13 @@ char *validate_wav_header(char *header)
{ {
Wave_Header *w = (Wave_Header *)header; Wave_Header *w = (Wave_Header *)header;
if (strncmp(w->riffID, WAV_RIFF_MAGIC, 4)) if (memcmp(w->riffID, WAV_RIFF_MAGIC, 4))
return NULL; return NULL;
if (strncmp(w->waveID, WAV_WAVE_MAGIC, 4)) if (memcmp(w->waveID, WAV_WAVE_MAGIC, 4))
return NULL; return NULL;
if (strncmp(w->fmtID, WAV_FMT_MAGIC, 4)) if (memcmp(w->fmtID, WAV_FMT_MAGIC, 4))
return NULL; return NULL;
if (w->fmtsize != 16) if (w->fmtsize != 16)
@@ -66,7 +66,7 @@ Wave_Header *w = (Wave_Header *)header;
return NULL; return NULL;
#endif #endif
if (strncmp(w->dataID, WAV_DATA_MAGIC, 4)) if (memcmp(w->dataID, WAV_DATA_MAGIC, 4))
return(NULL); return(NULL);
return (header + sizeof(Wave_Header)); return (header + sizeof(Wave_Header));
} }