# HG changeset patch # User Daniel Atallah # Date 1224647354 0 # Node ID 5f2496830fd4e46075583adbc9e52625a40e255e # Parent a4a7084ee09ddce944ccfb78373f5a0c6da5810e Clean up some unnecessary and unused code in the purple_circ_buffer_append() function. Thanks to Ryan Fan for noticing. Also avoid calling memcpy for 0 bytes. Fixes #7282 diff -r a4a7084ee09d -r 5f2496830fd4 libpurple/circbuffer.c --- a/libpurple/circbuffer.c Tue Oct 21 16:26:31 2008 +0000 +++ b/libpurple/circbuffer.c Wed Oct 22 03:49:14 2008 +0000 @@ -109,13 +109,12 @@ else len_stored = len; - memcpy(buf->inptr, src, len_stored); + if (len_stored > 0) + memcpy(buf->inptr, src, len_stored); if (len_stored < len) { memcpy(buf->buffer, (char*)src + len_stored, len - len_stored); buf->inptr = buf->buffer + (len - len_stored); - } else if ((buf->buffer - buf->inptr) == len_stored) { - buf->inptr = buf->buffer; } else { buf->inptr += len_stored; }