From ca7f9c6b86e2c279528e616d3ea3bb79476587a7 Mon Sep 17 00:00:00 2001 From: Tim Cava Date: Sun, 11 Aug 2013 08:20:37 +0000 Subject: [PATCH] Use memcmp, rather than strncmp, in wavplay's validate_wav_header(), and avoid warnings about mismatched signedness. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@311 13b04d17-f746-0410-82c6-800466cd88b0 --- dll/wavplay/wavplay.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/wavplay/wavplay.c b/dll/wavplay/wavplay.c index 35e739e..8e5a33f 100644 --- a/dll/wavplay/wavplay.c +++ b/dll/wavplay/wavplay.c @@ -46,13 +46,13 @@ char *validate_wav_header(char *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; - if (strncmp(w->waveID, WAV_WAVE_MAGIC, 4)) + if (memcmp(w->waveID, WAV_WAVE_MAGIC, 4)) return NULL; - if (strncmp(w->fmtID, WAV_FMT_MAGIC, 4)) + if (memcmp(w->fmtID, WAV_FMT_MAGIC, 4)) return NULL; if (w->fmtsize != 16) @@ -66,7 +66,7 @@ Wave_Header *w = (Wave_Header *)header; return NULL; #endif - if (strncmp(w->dataID, WAV_DATA_MAGIC, 4)) + if (memcmp(w->dataID, WAV_DATA_MAGIC, 4)) return(NULL); return (header + sizeof(Wave_Header)); }