From 1308290c0ddcc19b0759d05e2b07be6d08147e7d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 12 Apr 2008 04:21:22 +0000 Subject: yet another migration to size_t We can also get rid of one the two variables. git-svn-id: https://svn.musicpd.org/mpd/trunk@7341 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/outputBuffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/outputBuffer.c b/src/outputBuffer.c index 9d77caf3a..daf03d4b0 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -204,8 +204,7 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, size_t dataInLen, float data_time, mpd_uint16 bitRate, ReplayGainInfo * replayGainInfo) { - mpd_uint16 dataToSend; - mpd_uint16 chunkLeft; + size_t dataToSend; char *data; size_t datalen; static char *convBuffer; @@ -244,8 +243,9 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, chunk = outputBufferGetChunk(cb, chunk_index); - chunkLeft = sizeof(chunk->data) - chunk->chunkSize; - dataToSend = datalen > chunkLeft ? chunkLeft : datalen; + dataToSend = sizeof(chunk->data) - chunk->chunkSize; + if (dataToSend > datalen) + dataToSend = datalen; memcpy(chunk->data + chunk->chunkSize, data, dataToSend); chunk->chunkSize += dataToSend; -- cgit v1.2.3