Skip to content

M
mpd
Commit 1308290c authored by Max Kellermann's avatar Max Kellermann Committed by Eric Wong
Browse files
Options

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
parent bc7e60cb
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/outputBuffer.c
View file @ 1308290c
...@@ -204,8 +204,7 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, ...@@ -204,8 +204,7 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
size_t dataInLen, float data_time, mpd_uint16 bitRate, size_t dataInLen, float data_time, mpd_uint16 bitRate,
ReplayGainInfo * replayGainInfo) ReplayGainInfo * replayGainInfo)
{ {
mpd_uint16 dataToSend; size_t dataToSend;
mpd_uint16 chunkLeft;
char *data; char *data;
size_t datalen; size_t datalen;
static char *convBuffer; static char *convBuffer;
...@@ -244,8 +243,9 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, ...@@ -244,8 +243,9 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
chunk = outputBufferGetChunk(cb, chunk_index); chunk = outputBufferGetChunk(cb, chunk_index);
chunkLeft = sizeof(chunk->data) - chunk->chunkSize; dataToSend = sizeof(chunk->data) - chunk->chunkSize;
dataToSend = datalen > chunkLeft ? chunkLeft : datalen; if (dataToSend > datalen)
dataToSend = datalen;
memcpy(chunk->data + chunk->chunkSize, data, dataToSend); memcpy(chunk->data + chunk->chunkSize, data, dataToSend);
chunk->chunkSize += dataToSend; chunk->chunkSize += dataToSend;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment