aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-08-20 03:11:12 +0000
committerAvuton Olrich <avuton@gmail.com>2006-08-20 03:11:12 +0000
commitaa487e6c75a6a9bd70189707f977fd66ba9c12a7 (patch)
tree6d0e9c2adaefdebe19619863442b6452e3422223 /src
parent54a1a9f2b638eeb916e32aa656be5c0c9366ddee (diff)
downloadmpd-aa487e6c75a6a9bd70189707f977fd66ba9c12a7.tar.gz
mpd-aa487e6c75a6a9bd70189707f977fd66ba9c12a7.tar.xz
mpd-aa487e6c75a6a9bd70189707f977fd66ba9c12a7.zip
This fixes 5 potential bugs where the conditional would always be true.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4659 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
-rw-r--r--src/charConv.c2
-rw-r--r--src/inputPlugins/_ogg_common.c2
-rw-r--r--src/inputPlugins/aac_plugin.c4
-rw-r--r--src/myfprintf.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/charConv.c b/src/charConv.c
index 870e6c3e2..62fc5f68e 100644
--- a/src/charConv.c
+++ b/src/charConv.c
@@ -122,7 +122,7 @@ char *convStrDup(char *string)
iconv(char_conv_iconv, &string, &inleft, &bufferPtr,
&outleft);
if (outleft == BUFFER_SIZE
- || (err < 0 && errno != E2BIG)) {
+ || (err == -1L && errno != E2BIG)) {
free(ret);
return NULL;
}
diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c
index 8abdc33bc..e4a264ac3 100644
--- a/src/inputPlugins/_ogg_common.c
+++ b/src/inputPlugins/_ogg_common.c
@@ -40,7 +40,7 @@ ogg_stream_type ogg_stream_type_detect(InputStream * inStream)
while (to_read) {
r = readFromInputStream(inStream, buf, 1, to_read);
- if (r < 0)
+ if (r < inStream->error)
break;
to_read -= r;
if (!r && !inputStreamAtEOF(inStream))
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index c24254b54..8f7f83a9f 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -239,7 +239,7 @@ static float getAacFloatTotalTime(char *file)
unsigned int sampleRate;
unsigned char channels;
InputStream inStream;
- size_t bread;
+ long bread;
if (openInputStream(&inStream, file) < 0)
return -1;
@@ -291,7 +291,7 @@ static int aac_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
faacDecHandle decoder;
faacDecFrameInfo frameInfo;
faacDecConfigurationPtr config;
- size_t bread;
+ long bread;
unsigned int sampleRate;
unsigned char channels;
int eof = 0;
diff --git a/src/myfprintf.c b/src/myfprintf.c
index 6f0da2fdd..dac58ab34 100644
--- a/src/myfprintf.c
+++ b/src/myfprintf.c
@@ -36,7 +36,7 @@
static void blockingWrite(const int fd, const char *string, size_t len)
{
while (len) {
- size_t ret = xwrite(fd, string, len);
+ ssize_t ret = xwrite(fd, string, len);
if (ret == len)
return;
if (ret >= 0) {