Mercurial > pidgin

comparison libpurple/circbuffer.c @ 24286:5f2496830fd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 22 Oct 2008 03:49:14 +0000
parents 6bf32c9e15a7
children 70df8067d41e 584063555949
comparison
equal deleted inserted replaced
24285:a4a7084ee09d 24286:5f2496830fd4
107 len_stored = MIN(len, buf->buflen 107 len_stored = MIN(len, buf->buflen
108 - (buf->inptr - buf->buffer)); 108 - (buf->inptr - buf->buffer));
109 else 109 else
110 len_stored = len; 110 len_stored = len;
111 111
112 memcpy(buf->inptr, src, len_stored); 112 if (len_stored > 0)
113 memcpy(buf->inptr, src, len_stored);
113 114
114 if (len_stored < len) { 115 if (len_stored < len) {
115 memcpy(buf->buffer, (char*)src + len_stored, len - len_stored); 116 memcpy(buf->buffer, (char*)src + len_stored, len - len_stored);
116 buf->inptr = buf->buffer + (len - len_stored); 117 buf->inptr = buf->buffer + (len - len_stored);
117 } else if ((buf->buffer - buf->inptr) == len_stored) {
118 buf->inptr = buf->buffer;
119 } else { 118 } else {
120 buf->inptr += len_stored; 119 buf->inptr += len_stored;
121 } 120 }
122 121
123 buf->bufused += len; 122 buf->bufused += len;