Mercurial > libjeffpc

changeset 711:f2cc03ad4b1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
buffer: rename buffer_used to buffer_size The new name is a whole lot clearer about what is being returned. Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Tue, 19 Mar 2019 14:39:29 -0400
parents 473a2904ef50
children 8295148e8f44
files fmt_cbor.c include/jeffpc/buffer.h tests/test_buffer.c tests/test_cbor_pack.c tests/test_cbor_unpack.c tests/test_nvl_pack.c val_pack.c
diffstat 7 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/fmt_cbor.c	Tue Mar 19 14:17:51 2019 -0400
+++ b/fmt_cbor.c	Tue Mar 19 14:39:29 2019 -0400
@@ -506,7 +506,7 @@
 {
 	ssize_t ret;
 
-	ret = buffer_seek(orig, buffer_used(tmp), SEEK_CUR);
+	ret = buffer_seek(orig, buffer_size(tmp), SEEK_CUR);
 
 	return (ret < 0) ? ret : 0;
 }
--- a/include/jeffpc/buffer.h	Tue Mar 19 14:17:51 2019 -0400
+++ b/include/jeffpc/buffer.h	Tue Mar 19 14:39:29 2019 -0400
@@ -81,7 +81,7 @@
 extern ssize_t buffer_pwrite(struct buffer *buffer, const void *data, size_t len,
 			     size_t off);
 
-static inline size_t buffer_used(struct buffer *buffer)
+static inline size_t buffer_size(struct buffer *buffer)
 {
 	return buffer->used;
 }
--- a/tests/test_buffer.c	Tue Mar 19 14:17:51 2019 -0400
+++ b/tests/test_buffer.c	Tue Mar 19 14:39:29 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
+ * Copyright (c) 2017-2019 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,7 @@
 	size_t i;
 
 	data = buffer_data(buffer);
-	len = buffer_used(buffer);
+	len = buffer_size(buffer);
 
 	if (startoff > len)
 		fail("%s startoff > len (%zu > %zu)", __func__, startoff, len);
@@ -82,9 +82,9 @@
 {
 	size_t got;
 
-	got = buffer_used(buffer);
+	got = buffer_size(buffer);
 	if (got != expected)
-		fail("buffer_used() == %zu, should be %zu", got, expected);
+		fail("buffer_size() == %zu, should be %zu", got, expected);
 }
 
 static inline void check_append_err(struct buffer *buffer, const void *ptr,
@@ -184,7 +184,7 @@
 		check_used(buffer, i + 1);
 
 		/* truncate to same size */
-		check_truncate(buffer, buffer_used(buffer));
+		check_truncate(buffer, buffer_size(buffer));
 		check(buffer);
 		check_used(buffer, i + 1);
 	}
--- a/tests/test_cbor_pack.c	Tue Mar 19 14:17:51 2019 -0400
+++ b/tests/test_cbor_pack.c	Tue Mar 19 14:39:29 2019 -0400
@@ -30,7 +30,7 @@
 
 static inline void dumpbuf(struct buffer *buf)
 {
-	const size_t len = buffer_used(buf);
+	const size_t len = buffer_size(buf);
 	char tmp[len * 2 + 1];
 
 	hexdumpz(tmp, buffer_data(buf), len, false);
@@ -46,12 +46,12 @@
 	dumpbuf(got);
 	fprintf(stderr, "\n");
 
-	if (buffer_used(got) != buffer_used(exp))
+	if (buffer_size(got) != buffer_size(exp))
 		fail("cbor packing failed: length mismatch "
-		     "(got %zu, expected %zu)", buffer_used(got),
-		     buffer_used(exp));
+		     "(got %zu, expected %zu)", buffer_size(got),
+		     buffer_size(exp));
 
-	if (memcmp(buffer_data(got), buffer_data(exp), buffer_used(got)))
+	if (memcmp(buffer_data(got), buffer_data(exp), buffer_size(got)))
 		fail("cbor packing failed: content mismatch");
 }
 
--- a/tests/test_cbor_unpack.c	Tue Mar 19 14:17:51 2019 -0400
+++ b/tests/test_cbor_unpack.c	Tue Mar 19 14:39:29 2019 -0400
@@ -31,7 +31,7 @@
 
 static inline void dumpbuf(struct buffer *buf)
 {
-	const size_t len = buffer_used(buf);
+	const size_t len = buffer_size(buf);
 	char tmp[len * 2 + 1];
 
 	hexdumpz(tmp, buffer_data(buf), len, false);
@@ -45,7 +45,7 @@
 		int ret;						\
 									\
 		buffer_init_static(&tmp, buffer_data(in),		\
-				   buffer_used(in), false);		\
+				   buffer_size(in), false);		\
 									\
 		fprintf(stderr, "unpack via %s (should %s)...",		\
 			#fxn, (exp_ret) ? "fail" : "succeed");		\
--- a/tests/test_nvl_pack.c	Tue Mar 19 14:17:51 2019 -0400
+++ b/tests/test_nvl_pack.c	Tue Mar 19 14:39:29 2019 -0400
@@ -93,7 +93,7 @@
 
 static inline void dumpbuf(struct buffer *buf, bool hex)
 {
-	const size_t len = buffer_used(buf);
+	const size_t len = buffer_size(buf);
 	char tmp[len * 2 + 1];
 
 	if (hex) {
@@ -116,12 +116,12 @@
 	dumpbuf(got, hex);
 	fprintf(stderr, "\n");
 
-	if (buffer_used(got) != buffer_used(exp))
+	if (buffer_size(got) != buffer_size(exp))
 		fail("%s packing failed: length mismatch "
-		     "(got %zu, expected %zu)", name, buffer_used(got),
-		     buffer_used(exp));
+		     "(got %zu, expected %zu)", name, buffer_size(got),
+		     buffer_size(exp));
 
-	if (memcmp(buffer_data(got), buffer_data(exp), buffer_used(got)))
+	if (memcmp(buffer_data(got), buffer_data(exp), buffer_size(got)))
 		fail("%s packing failed: content mismatch", name);
 }
 
@@ -130,7 +130,7 @@
 				     struct buffer *expected,
 				     enum val_format fmt)
 {
-	const size_t rawsize = buffer_used(expected);
+	const size_t rawsize = buffer_size(expected);
 	uint8_t *raw = alloca(rawsize);
 	struct buffer *buf;
 	struct buffer tmp;
--- a/val_pack.c	Tue Mar 19 14:17:51 2019 -0400
+++ b/val_pack.c	Tue Mar 19 14:39:29 2019 -0400
@@ -51,7 +51,7 @@
 
 	ret = do_val_pack(&buffer, val, format);
 
-	return ret ? ret : buffer_used(&buffer);
+	return ret ? ret : buffer_size(&buffer);
 }
 
 struct buffer *val_pack(struct val *val, enum val_format format)
@@ -80,5 +80,5 @@
 
 	ret = do_val_pack(&buffer, val, format);
 
-	return ret ? ret : buffer_used(&buffer);
+	return ret ? ret : buffer_size(&buffer);
 }