comparison: libgaim/circbuffer.c
libgaim/circbuffer.c
- changeset 15017
- 2264f54d2342
- parent 14254
- 77edc7a6191a
- child 15359
- 4317e3cb888e
equal
deleted
inserted
replaced
| 15016:bdc3f402b3a0 | 15017:2264f54d2342 |
|---|---|
| 102 len_stored = len; | 102 len_stored = len; |
| 103 | 103 |
| 104 memcpy(buf->inptr, src, len_stored); | 104 memcpy(buf->inptr, src, len_stored); |
| 105 | 105 |
| 106 if (len_stored < len) { | 106 if (len_stored < len) { |
| 107 memcpy(buf->buffer, src + len_stored, len - len_stored); | 107 memcpy(buf->buffer, (char*)src + len_stored, len - len_stored); |
| 108 buf->inptr = buf->buffer + (len - len_stored); | 108 buf->inptr = buf->buffer + (len - len_stored); |
| 109 } else if ((buf->buffer - buf->inptr) == len_stored) { | 109 } else if ((buf->buffer - buf->inptr) == len_stored) { |
| 110 buf->inptr = buf->buffer; | 110 buf->inptr = buf->buffer; |
| 111 } else { | 111 } else { |
| 112 buf->inptr += len_stored; | 112 buf->inptr += len_stored; |
