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

yet another migration to size_t

Browse Source 
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
This commit is contained in:
Max Kellermann 2008-04-12 04:21:22 +00:00 committed by Eric Wong
parent bc7e60cbcd
commit 1308290c0d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/outputBuffer.c
View File

@ -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,
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;