oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fix sign compare warnings

Browse Source 
Do explicit casts before comparing signed with unsigned.  The one in
log.c actually fixes another warning: in the expanded macro, there may
be a check "logLevel>=0", which is always true.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7230 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann 2008-04-12 04:06:52 +00:00 committed by Eric Wong
parent c011ab8105
commit b60789dd8c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/decode.c
View File

@ -487,7 +487,7 @@ static void advanceOutputBufferTo(OutputBuffer * cb, PlayerControl * pc,
while (cb->begin != to) { while (cb->begin != to) {
handleMetadata(cb, pc, previous, currentChunkSent, handleMetadata(cb, pc, previous, currentChunkSent,
currentChunk); currentChunk);
if (cb->begin + 1 >= buffered_chunks) { if ((unsigned)cb->begin + 1 >= buffered_chunks) {
cb->begin = 0; cb->begin = 0;
} }
else cb->begin++; else cb->begin++;
@ -522,7 +522,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
kill(getppid(), SIGUSR1); kill(getppid(), SIGUSR1);
while (decode_pid > 0 && while (decode_pid > 0 &&
cb->end - cb->begin < bbp && (unsigned)(cb->end - cb->begin) < bbp &&
cb->end != buffered_chunks - 1 && cb->end != buffered_chunks - 1 &&
dc->state != DECODE_STATE_STOP) { dc->state != DECODE_STATE_STOP) {
processDecodeInput(); processDecodeInput();
@ -582,8 +582,8 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
if (end < cb->begin) if (end < cb->begin)
test += buffered_chunks; test += buffered_chunks;
nextChunk = cb->begin + crossFadeChunks; nextChunk = cb->begin + crossFadeChunks;
if (nextChunk < test) { if ((unsigned)nextChunk < test) {
if (nextChunk >= buffered_chunks) { if ((unsigned)nextChunk >= buffered_chunks) {
nextChunk -= buffered_chunks; nextChunk -= buffered_chunks;
} }
pcm_mix(cb->chunks + pcm_mix(cb->chunks +
@ -621,7 +621,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
} }
pc->totalPlayTime += pc->totalPlayTime +=
sizeToTime * cb->chunkSize[cb->begin]; sizeToTime * cb->chunkSize[cb->begin];
if (cb->begin + 1 >= buffered_chunks) { if ((unsigned)cb->begin + 1 >= buffered_chunks) {
cb->begin = 0; cb->begin = 0;
} else } else
cb->begin++; cb->begin++;
@ -632,8 +632,8 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
test = end; test = end;
if (end < cb->begin) if (end < cb->begin)
test += buffered_chunks; test += buffered_chunks;
if (nextChunk < test) { if ((unsigned)nextChunk < test) {
if (nextChunk >= buffered_chunks) { if ((unsigned)nextChunk >= buffered_chunks) {
nextChunk -= buffered_chunks; nextChunk -= buffered_chunks;
} }
advanceOutputBufferTo(cb, pc, advanceOutputBufferTo(cb, pc,

2
src/interface.c
View File

@ -644,7 +644,7 @@ static void flushInterfaceBuffer(Interface * interface)
if (ret < 0) if (ret < 0)
break; break;
else if ((size_t)ret < buf->size) { else if ((size_t)ret < buf->size) {
assert(interface->deferred_bytes >= ret); assert(interface->deferred_bytes >= (size_t)ret);
interface->deferred_bytes -= ret; interface->deferred_bytes -= ret;
buf->data = (char *)buf->data + ret; buf->data = (char *)buf->data + ret;
buf->size -= ret; buf->size -= ret;

2
src/log.c
View File

@ -169,7 +169,7 @@ void setup_log_output(const int use_stdout)
#define log_func(func,level,fp) \ #define log_func(func,level,fp) \
mpd_printf void func(const char *fmt, ...) \ mpd_printf void func(const char *fmt, ...) \
{ \ { \
if (logLevel >= level) { \ if ((int)logLevel >= level) { \
va_list args; \ va_list args; \
va_start(args, fmt); \ va_start(args, fmt); \
do_log(fp, fmt, args); \ do_log(fp, fmt, args); \

2
src/outputBuffer.c
View File

@ -75,7 +75,7 @@ void clearOutputBuffer(OutputBuffer * cb)
void flushOutputBuffer(OutputBuffer * cb) void flushOutputBuffer(OutputBuffer * cb)
{ {
if (currentChunk == cb->end) { if (currentChunk == cb->end) {
if ((cb->end + 1) >= buffered_chunks) { if (((unsigned)cb->end + 1) >= buffered_chunks) {
cb->end = 0; cb->end = 0;
} }
else cb->end++; else cb->end++;