diff options
| author | Lars-Dominik Braun <PromyLOPh@gmail.com> | 2008-08-25 11:37:34 +0200 |
|---|---|---|
| committer | Lars-Dominik Braun <PromyLOPh@gmail.com> | 2008-08-25 11:37:34 +0200 |
| commit | d79795d1576d69a57a852c4f279da133e68755df (patch) | |
| tree | d941ad24b588a5830bfbafa9dcbd24b278379825 /libpiano/src/http.c | |
| parent | 496e61c506f283135a52a95dec5bf43c87e39cc8 (diff) | |
| download | pianobar-d79795d1576d69a57a852c4f279da133e68755df.tar.gz pianobar-d79795d1576d69a57a852c4f279da133e68755df.tar.bz2 pianobar-d79795d1576d69a57a852c4f279da133e68755df.zip | |
piano: Code refactoring
Avoid strncat/strncpy, cache strlen result, ...
Diffstat (limited to 'libpiano/src/http.c')
| -rw-r--r-- | libpiano/src/http.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libpiano/src/http.c b/libpiano/src/http.c index 88d299c..96655ca 100644 --- a/libpiano/src/http.c +++ b/libpiano/src/http.c @@ -28,7 +28,6 @@ THE SOFTWARE. #define PIANO_HTTP_BUFFER_SIZE 100000 -/* FIXME: curl has a receive limit, use it! */ /* callback for curl, writes data to buffer * @param received data * @param block size @@ -37,15 +36,14 @@ THE SOFTWARE. * @return written bytes */ size_t PianoCurlRetToVar (void *ptr, size_t size, size_t nmemb, void *stream) { - char *charPtr = ptr; char *streamPtr = stream; size_t streamPtrN = strlen (streamPtr); - if (streamPtrN + nmemb > PIANO_HTTP_BUFFER_SIZE) { + if ((streamPtrN + nmemb) > (PIANO_HTTP_BUFFER_SIZE - 1)) { printf ("buffer overflow...\n"); return 0; } else { - memcpy (streamPtr+streamPtrN, charPtr, size*nmemb); + memcpy (&streamPtr[streamPtrN], ptr, size*nmemb); return size*nmemb; } } |