diff -r 16219eba3a0a -r 2cfbcbe86a7c src/buffer.c --- a/src/buffer.c Sat Apr 30 08:40:40 2022 +0200 +++ b/src/buffer.c Sat Apr 30 09:03:17 2022 +0200 @@ -169,6 +169,26 @@ return len / size; } +int cxBufferPut( + CxBuffer *buffer, + int c +) { + c &= 0xFF; + unsigned char const ch = c; + if (cxBufferWrite(&ch, 1, 1, buffer) == 1) { + return c; + } else { + return EOF; + } +} + +size_t cxBufferPutString( + CxBuffer *buffer, + const char *str +) { + return cxBufferWrite(str, 1, strlen(str), buffer); +} + size_t cxBufferRead( void *ptr, size_t size, @@ -194,29 +214,6 @@ return len / size; } -int cxBufferPut( - CxBuffer *buffer, - int c -) { - if (buffer->pos >= buffer->capacity) { - if ((buffer->flags & CX_BUFFER_AUTO_EXTEND) == CX_BUFFER_AUTO_EXTEND) { - if (cxBufferMinimumCapacity(buffer, buffer->capacity + 1)) { - return EOF; - } - } else { - return EOF; - } - } - - c &= 0xFF; - buffer->bytes[buffer->pos] = (unsigned char) c; - buffer->pos++; - if (buffer->pos > buffer->size) { - buffer->size = buffer->pos; - } - return c; -} - int cxBufferGet(CxBuffer *buffer) { if (cxBufferEof(buffer)) { return EOF; @@ -227,13 +224,6 @@ } } -size_t cxBufferPutString( - CxBuffer *buffer, - const char *str -) { - return cxBufferWrite(str, 1, strlen(str), buffer); -} - int cxBufferShiftLeft( CxBuffer *buffer, size_t shift