Fixes & restoring (32/128) buffer configuration

printbuf.c

@@ -30,7 +30,11 @@
 #include "snprintf_compat.h"
 #include "vasprintf_compat.h"
 
-#define PRINTBUF_DEFAULT_SIZE 	(32)
+/* Default starting size of buffer and
+ * sprintbuf buffer
+ * */
+#define PRINTBUF_DEFAULT_SIZE		(32)
+#define PRINTBUF_DEFAULT_SIZE_BUF	(128)
 
 static int printbuf_extend(struct printbuf *p, int min_size);
 
@@ -148,7 +152,6 @@ int sprintbuf(struct printbuf *p, const char *msg, ...)
   va_list ap;
   char *t;
   long int size;
-#define PRINTBUF_DEFAULT_SIZE_BUF ((PRINTBUF_DEFAULT_SIZE<<2) > +1)
   char buf[PRINTBUF_DEFAULT_SIZE_BUF];
 
   /* user stack buffer first */

test_printbuf.c

@@ -0,0 +1,221 @@
+#include <assert.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#include "debug.h"
+#include "printbuf.h"
+
+static void test_basic_printbuf_memset(void);
+static void test_printbuf_memset_length(void);
+
+#ifndef __func__
+/* VC++ compat */
+#define __func__ __FUNCTION__
+#endif
+
+static void test_basic_printbuf_memset()
+{
+	struct printbuf *pb;
+
+	printf("%s: starting test\n", __func__);
+	pb = printbuf_new();
+	sprintbuf(pb, "blue:%d", 1);
+	printbuf_memset(pb, -1, 'x', 52);
+	printf("Buffer contents:%.*s\n", printbuf_length(pb), pb->buf);
+	printbuf_free(pb);
+	printf("%s: end test\n", __func__);
+}
+
+static void test_printbuf_memset_length()
+{
+	struct printbuf *pb;
+
+	printf("%s: starting test\n", __func__);
+	pb = printbuf_new();
+	printbuf_memset(pb, -1, ' ', 0);
+	printbuf_memset(pb, -1, ' ', 0);
+	printbuf_memset(pb, -1, ' ', 0);
+	printbuf_memset(pb, -1, ' ', 0);
+	printbuf_memset(pb, -1, ' ', 0);
+	printf("Buffer length: %d\n", printbuf_length(pb));
+	printbuf_memset(pb, -1, ' ', 2);
+	printbuf_memset(pb, -1, ' ', 4);
+	printbuf_memset(pb, -1, ' ', 6);
+	printf("Buffer length: %d\n", printbuf_length(pb));
+	printbuf_memset(pb, -1, ' ', 6);
+	printf("Buffer length: %d\n", printbuf_length(pb));
+	printbuf_memset(pb, -1, ' ', 8);
+	printbuf_memset(pb, -1, ' ', 10);
+	printbuf_memset(pb, -1, ' ', 10);
+	printbuf_memset(pb, -1, ' ', 10);
+	printbuf_memset(pb, -1, ' ', 20);
+	printf("Buffer length: %d\n", printbuf_length(pb));
+
+	// No length change should occur
+	printbuf_memset(pb, 0, 'x', 30);
+	printf("Buffer length: %d\n", printbuf_length(pb));
+
+	// This should extend it by one.
+	printbuf_memset(pb, 0, 'x', printbuf_length(pb) + 1);
+	printf("Buffer length: %d\n", printbuf_length(pb));
+
+	printbuf_free(pb);
+	printf("%s: end test\n", __func__);
+}
+
+static void test_printbuf_memappend(int *before_resize);
+static void test_printbuf_memappend(int *before_resize)
+{
+	struct printbuf *pb;
+	int initial_size;
+
+	printf("%s: starting test\n", __func__);
+	pb = printbuf_new();
+	printf("Buffer length: %d\n", printbuf_length(pb));
+
+	initial_size = pb->size;
+
+	while(pb->size == initial_size)
+	{
+		printbuf_memappend_fast(pb, "x", 1);
+	}
+	*before_resize = printbuf_length(pb) - 1;
+	printf("Appended %d bytes for resize: [%s]\n", *before_resize + 1, pb->buf);
+
+	printbuf_reset(pb);
+	printbuf_memappend_fast(pb, "bluexyz123", 3);
+	printf("Partial append: %d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	char with_nulls[] = { 'a', 'b', '\0', 'c' };
+	printbuf_reset(pb);
+	printbuf_memappend_fast(pb, with_nulls, (int)sizeof(with_nulls));
+	printf("With embedded \\0 character: %d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	printbuf_free(pb);
+	pb = printbuf_new();
+	char *data = malloc(*before_resize);
+	memset(data, 'X', *before_resize);
+	printbuf_memappend_fast(pb, data, *before_resize);
+	printf("Append to just before resize: %d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	free(data);
+	printbuf_free(pb);
+
+	pb = printbuf_new();
+	data = malloc(*before_resize + 1);
+	memset(data, 'X', *before_resize + 1);
+	printbuf_memappend_fast(pb, data, *before_resize + 1);
+	printf("Append to just after resize: %d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	free(data);
+	printbuf_free(pb);
+
+#define SA_TEST_STR "XXXXXXXXXXXXXXXX"
+	pb = printbuf_new();
+	printbuf_strappend(pb, SA_TEST_STR);
+	printf("Buffer size after printbuf_strappend(): %d, [%s]\n", printbuf_length(pb), pb->buf);
+	printbuf_free(pb);
+#undef  SA_TEST_STR
+
+	printf("%s: end test\n", __func__);
+}
+
+#if 0
+static void test_sprintbuf(int before_resize);
+static void test_sprintbuf(int before_resize)
+{
+	struct printbuf *pb;
+
+	printf("%s: starting test\n", __func__);
+	pb = printbuf_new();
+	printf("Buffer length: %d\n", printbuf_length(pb));
+
+	char *data = malloc(before_resize + 1 + 1);
+	memset(data, 'X', before_resize + 1 + 1);
+	data[before_resize + 1] = '\0';
+	sprintbuf(pb, "%s", data);
+	free(data);
+	printf("sprintbuf to just after resize(%d+1): %d, [%s], strlen(buf)=%d\n", before_resize, printbuf_length(pb), pb->buf, (int)strlen(pb->buf));
+
+	printbuf_reset(pb);
+	sprintbuf(pb, "plain");
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%d", 1);
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%d", INT_MAX);
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%d", INT_MIN);
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%s", "%s");
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	printbuf_free(pb);
+	printf("%s: end test\n", __func__);
+}
+#endif
+
+#if 1
+static void test_sprintbuf(int before_resize);
+static void test_sprintbuf(int before_resize)
+{
+	struct printbuf *pb;
+
+	printf("%s: starting test\n", __func__);
+	pb = printbuf_new();
+	printf("Buffer length: %d\n", printbuf_length(pb));
+
+	char *data = malloc(before_resize + 1 + 1);
+	memset(data, 'X', before_resize + 1 + 1);
+	data[before_resize + 1] = '\0';
+	sprintbuf(pb, "%s", data);
+	free(data);
+	printf("sprintbuf to just after resize(%d+1): %d, [%s], strlen(buf)=%d\n", before_resize, printbuf_length(pb), pb->buf, (int)strlen(pb->buf));
+
+	printbuf_reset(pb);
+	sprintbuf(pb, "plain");
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%d", 1);
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%d", INT_MAX);
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%d", INT_MIN);
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	sprintbuf(pb, "%s", "%s");
+	printf("%d, [%s]\n", printbuf_length(pb), pb->buf);
+
+	printbuf_free(pb);
+	printf("%s: end test\n", __func__);
+}
+#endif
+
+int main(int argc, char **argv)
+{
+	int before_resize = 0;
+
+	MC_SET_DEBUG(1);
+
+	test_basic_printbuf_memset();
+	printf("========================================\n");
+	test_printbuf_memset_length();
+	printf("========================================\n");
+	test_printbuf_memappend(&before_resize);
+	printf("========================================\n");
+	test_sprintbuf(before_resize);
+	printf("========================================\n");
+/*
+	test_sprintbuf2(before_resize);
+	printf("========================================\n");
+*/
+	return 0;
+}

test_printbuf.expected

@@ -25,19 +25,9 @@ test_sprintbuf: starting test
 Buffer length: 0
 sprintbuf to just after resize(31+1): 32, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX], strlen(buf)=32
 5, [plain]
-6, [plain]
-16, [plain]
-27, [plain]
-29, [plain]
+6, [plain1]
+16, [plain12147483647]
+27, [plain12147483647-2147483648]
+29, [plain12147483647-2147483648%s]
 test_sprintbuf: end test
 ========================================
-test_sprintbuf2: starting test
-Buffer length: 0
-sprintbuf to just after resize(31+1): 32, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX], strlen(buf)=32
-5, [plain]
-6, [plain]
-16, [plain]
-27, [plain]
-29, [plain]
-test_sprintbuf2: end test
-========================================