1 files changed, 43 insertions, 24 deletions

diff --git a/source/fitz/buffer.c b/source/fitz/buffer.c
index a2880659..ab814728 100644
--- a/source/fitz/buffer.c
+++ b/source/fitz/buffer.c
@@ -76,15 +76,15 @@ fz_new_buffer_from_base64(fz_context *ctx, const char *data, size_t size)
 		{
 			int c = *s++;
 			if (c >= 'A' && c <= 'Z')
-				fz_write_buffer_bits(ctx, buf, c - 'A', 6);
+				fz_append_bits(ctx, buf, c - 'A', 6);
 			else if (c >= 'a' && c <= 'z')
-				fz_write_buffer_bits(ctx, buf, c - 'a' + 26, 6);
+				fz_append_bits(ctx, buf, c - 'a' + 26, 6);
 			else if (c >= '0' && c <= '9')
-				fz_write_buffer_bits(ctx, buf, c - '0' + 52, 6);
+				fz_append_bits(ctx, buf, c - '0' + 52, 6);
 			else if (c == '+')
-				fz_write_buffer_bits(ctx, buf, 62, 6);
+				fz_append_bits(ctx, buf, 62, 6);
 			else if (c == '/')
-				fz_write_buffer_bits(ctx, buf, 63, 6);
+				fz_append_bits(ctx, buf, 63, 6);
 		}
 	}
 	fz_catch(ctx)
@@ -205,7 +205,8 @@ fz_append_buffer(fz_context *ctx, fz_buffer *buf, fz_buffer *extra)
 	buf->len += extra->len;
 }
 
-void fz_write_buffer(fz_context *ctx, fz_buffer *buf, const void *data, size_t len)
+void
+fz_append_data(fz_context *ctx, fz_buffer *buf, const void *data, size_t len)
 {
 	if (buf->len + len > buf->cap)
 		fz_ensure_buffer(ctx, buf, buf->len + len);
@@ -214,7 +215,19 @@ void fz_write_buffer(fz_context *ctx, fz_buffer *buf, const void *data, size_t l
 	buf->unused_bits = 0;
 }
 
-void fz_write_buffer_byte(fz_context *ctx, fz_buffer *buf, int val)
+void
+fz_append_string(fz_context *ctx, fz_buffer *buf, const char *data)
+{
+	size_t len = strlen(data);
+	if (buf->len + len > buf->cap)
+		fz_ensure_buffer(ctx, buf, buf->len + len);
+	memcpy(buf->data + buf->len, data, len);
+	buf->len += len;
+	buf->unused_bits = 0;
+}
+
+void
+fz_append_byte(fz_context *ctx, fz_buffer *buf, int val)
 {
 	if (buf->len + 1 > buf->cap)
 		fz_grow_buffer(ctx, buf);
@@ -222,7 +235,8 @@ void fz_write_buffer_byte(fz_context *ctx, fz_buffer *buf, int val)
 	buf->unused_bits = 0;
 }
 
-void fz_write_buffer_rune(fz_context *ctx, fz_buffer *buf, int c)
+void
+fz_append_rune(fz_context *ctx, fz_buffer *buf, int c)
 {
 	char data[10];
 	int len = fz_runetochar(data, c);
@@ -233,21 +247,24 @@ void fz_write_buffer_rune(fz_context *ctx, fz_buffer *buf, int c)
 	buf->unused_bits = 0;
 }
 
-void fz_write_buffer_int32_le(fz_context *ctx, fz_buffer *buf, int x)
+void
+fz_append_int32_le(fz_context *ctx, fz_buffer *buf, int x)
 {
-	fz_write_buffer_byte(ctx, buf, (x)&0xFF);
-	fz_write_buffer_byte(ctx, buf, (x>>8)&0xFF);
-	fz_write_buffer_byte(ctx, buf, (x>>16)&0xFF);
-	fz_write_buffer_byte(ctx, buf, (x>>24)&0xFF);
+	fz_append_byte(ctx, buf, (x)&0xFF);
+	fz_append_byte(ctx, buf, (x>>8)&0xFF);
+	fz_append_byte(ctx, buf, (x>>16)&0xFF);
+	fz_append_byte(ctx, buf, (x>>24)&0xFF);
 }
 
-void fz_write_buffer_int16_le(fz_context *ctx, fz_buffer *buf, int x)
+void
+fz_append_int16_le(fz_context *ctx, fz_buffer *buf, int x)
 {
-	fz_write_buffer_byte(ctx, buf, (x)&0xFF);
-	fz_write_buffer_byte(ctx, buf, (x>>8)&0xFF);
+	fz_append_byte(ctx, buf, (x)&0xFF);
+	fz_append_byte(ctx, buf, (x>>8)&0xFF);
 }
 
-void fz_write_buffer_bits(fz_context *ctx, fz_buffer *buf, int val, int bits)
+void
+fz_append_bits(fz_context *ctx, fz_buffer *buf, int val, int bits)
 {
 	int shift;
 
@@ -308,24 +325,25 @@ void fz_write_buffer_bits(fz_context *ctx, fz_buffer *buf, int val, int bits)
 	buf->unused_bits = bits;
 }
 
-void fz_write_buffer_pad(fz_context *ctx, fz_buffer *buf)
+void
+fz_append_bits_pad(fz_context *ctx, fz_buffer *buf)
 {
 	buf->unused_bits = 0;
 }
 
 size_t
-fz_buffer_printf(fz_context *ctx, fz_buffer *buffer, const char *fmt, ...)
+fz_append_printf(fz_context *ctx, fz_buffer *buffer, const char *fmt, ...)
 {
 	size_t ret;
 	va_list args;
 	va_start(args, fmt);
-	ret = fz_buffer_vprintf(ctx, buffer, fmt, args);
+	ret = fz_append_vprintf(ctx, buffer, fmt, args);
 	va_end(args);
 	return ret;
 }
 
 size_t
-fz_buffer_vprintf(fz_context *ctx, fz_buffer *buffer, const char *fmt, va_list old_args)
+fz_append_vprintf(fz_context *ctx, fz_buffer *buffer, const char *fmt, va_list old_args)
 {
 	size_t slack;
 	size_t len;
@@ -355,7 +373,7 @@ fz_buffer_vprintf(fz_context *ctx, fz_buffer *buffer, const char *fmt, va_list o
 }
 
 void
-fz_buffer_print_pdf_string(fz_context *ctx, fz_buffer *buffer, const char *text)
+fz_append_pdf_string(fz_context *ctx, fz_buffer *buffer, const char *text)
 {
 	size_t len = 2;
 	const char *s = text;
@@ -430,7 +448,8 @@ fz_buffer_print_pdf_string(fz_context *ctx, fz_buffer *buffer, const char *text)
 	buffer->len += len;
 }
 
-void fz_md5_buffer(fz_context *ctx, fz_buffer *buffer, unsigned char digest[16])
+void
+fz_md5_buffer(fz_context *ctx, fz_buffer *buffer, unsigned char digest[16])
 {
 	fz_md5 state;
 	fz_md5_init(&state);
@@ -469,7 +488,7 @@ fz_test_buffer_write(fz_context *ctx)
 			k = (rand() & 31)+1;
 			if (k > j)
 				k = j;
-			fz_write_buffer_bits(ctx, copy, fz_read_bits(ctx, stm, k), k);
+			fz_append_bits(ctx, copy, fz_read_bits(ctx, stm, k), k);
 			j -= k;
 		}
 		while (j);