aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-04-12 04:20:45 +0000
committerEric Wong <normalperson@yhbt.net>2008-04-12 04:20:45 +0000
commit1db6478491d0fd700687e33177b275fdfa90affc (patch)
tree5b2b8d5771b9429d9e312b5d62d517eb88239b6b
parenta25a7624f0f9d0f520ef155cd61bbcfcde352de1 (diff)
downloadmpd-1db6478491d0fd700687e33177b275fdfa90affc.tar.gz
mpd-1db6478491d0fd700687e33177b275fdfa90affc.tar.xz
mpd-1db6478491d0fd700687e33177b275fdfa90affc.zip
fix several errors/warnings which only appear with -O3
git-svn-id: https://svn.musicpd.org/mpd/trunk@7333 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/decode.c2
-rw-r--r--src/inputStream_http.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/decode.c b/src/decode.c
index 4ed0b6151..410eb8c04 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -342,6 +342,8 @@ static void * decoder_task(void *arg)
decoder_sleep(dc);
}
}
+
+ return NULL;
}
void decoderInit(DecoderControl * dc)
diff --git a/src/inputStream_http.c b/src/inputStream_http.c
index e633b7a66..51e3b63f3 100644
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -721,7 +721,7 @@ int inputStream_httpSeek(InputStream * inStream, long offset, int whence)
static void parseIcyMetadata(InputStream * inStream, char *metadata, int size)
{
- char *r;
+ char *r = NULL;
char *s;
char *temp = xmalloc(size + 1);
memcpy(temp, metadata, size);