From c3ba1bb95670abd4ba64445fa7edaea9cfa9e387 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 26 Jan 2008 12:46:37 +0000
Subject: fixed "comparison between signed and unsigned" Signed-off-by: Eric
Wong <normalperson@yhbt.net>
git-svn-id: https://svn.musicpd.org/mpd/trunk@7146 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
src/audioOutputs/audioOutput_shout.c | 2 +-
src/charConv.c | 2 +-
src/compress.c | 10 +++++-----
src/compress.h | 2 +-
src/inputPlugins/mp3_plugin.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index e4ee4916d..236e02b76 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -119,7 +119,7 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param)
char *user;
char *name;
BlockParam *blockParam;
- unsigned int public;
+ int public;
sd = newShoutData();
diff --git a/src/charConv.c b/src/charConv.c
index c2ef722a8..306ee9999 100644
--- a/src/charConv.c
+++ b/src/charConv.c
@@ -120,7 +120,7 @@ char *char_conv_str(char *dest, char *string)
iconv(char_conv_iconv, &string, &inleft, &bufferPtr,
&outleft);
if (outleft == BUFFER_SIZE
- || (err == -1L && errno != E2BIG)) {
+ || (err == (size_t)-1L && errno != E2BIG)) {
return NULL;
}
memcpy(dest + retlen, buffer, BUFFER_SIZE - outleft);
diff --git a/src/compress.c b/src/compress.c
index 7e526dc7a..2f7719356 100644
--- a/src/compress.c
+++ b/src/compress.c
@@ -44,7 +44,7 @@ static struct {
int target;
int gainmax;
int gainsmooth;
- int buckets;
+ unsigned buckets;
} prefs;
#ifdef USE_X
@@ -52,9 +52,9 @@ static int mon_init;
#endif
void CompressCfg(int show_mon, int anticlip, int target, int gainmax,
- int gainsmooth, int buckets)
+ int gainsmooth, unsigned buckets)
{
- static int lastsize;
+ static unsigned lastsize;
prefs.show_mon = show_mon;
prefs.anticlip = anticlip;
@@ -170,8 +170,8 @@ void CompressFree(void)
void CompressDo(void *data, unsigned int length)
{
int16_t *audio = (int16_t *)data, *ap;
- int peak, pos;
- int i;
+ int peak;
+ unsigned int i, pos;
int gr, gf, gn;
static int pn = -1;
#ifdef STATS
diff --git a/src/compress.h b/src/compress.h
index 42638f788..c0cee7821 100644
--- a/src/compress.h
+++ b/src/compress.h
@@ -38,7 +38,7 @@ void CompressCfg(int monitor,
int target,
int maxgain,
int smooth,
- int buckets);
+ unsigned buckets);
void CompressDo(void *data, unsigned int numSamples);
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 2d101f616..3e5071902 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -492,8 +492,8 @@ enum {
};
struct version {
- int major;
- int minor;
+ unsigned major;
+ unsigned minor;
};
struct lame {
--
cgit v1.2.3