More tests and fix attributes on wcsndup

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 81 insertions, 1 deletions

diff --git a/enaligned_reallocarray.c b/enaligned_reallocarray.c
index 35050ec..5a71207 100644
--- a/enaligned_reallocarray.c
+++ b/enaligned_reallocarray.c
@@ -4,7 +4,7 @@
 
 
 void *
-libsimple_enaligned_reallocarray(int status, void *ptr, size_t alignment, size_t n, size_t m) /* TODO test (ealigned_reallocarray) */
+libsimple_enaligned_reallocarray(int status, void *ptr, size_t alignment, size_t n, size_t m)
 {
 	void *ret = aligned_reallocarray(ptr, alignment, n, m);
 	if (!ret)
@@ -19,6 +19,86 @@ libsimple_enaligned_reallocarray(int status, void *ptr, size_t alignment, size_t
 int
 main(void)
 {
+#ifdef LIBSIMPLE_HAVE_ALIGNED_REALLOC
+
+	struct allocinfo *info;
+	void *ptr, *old;
+	DEFINE_CACHELINE;
+
+	assert((ptr = libsimple_enaligned_reallocarray(1, NULL, 16, 5, 2)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 10 || info->size == info->alignment);
+		assert(!info->zeroed);
+		ASSERT_ALIGNMENT(info, 16);
+		info->refcount += 1;
+	}
+	stpcpy(ptr, "test");
+	assert((ptr = libsimple_enaligned_reallocarray(1, old = ptr, 32, 10, 3)));
+	assert(!strcmp(ptr, "test"));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 30 || info->size == info->alignment);
+		assert(!info->zeroed);
+		ASSERT_ALIGNMENT(info, 32);
+		assert(ptr != old);
+		free(old);
+	}
+	free(ptr);
+
+	assert((ptr = libsimple_ealigned_reallocarray(NULL, 8, 5, 3)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 15 || info->size == 16);
+		assert(!info->zeroed);
+		ASSERT_ALIGNMENT(info, 8);
+		info->refcount += 1;
+	}
+	stpcpy(ptr, "test");
+	assert((ptr = libsimple_ealigned_reallocarray(old = ptr, 64, 10, 4)));
+	assert(!strcmp(ptr, "test"));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 40 || info->size == info->alignment);
+		assert(!info->zeroed);
+		ASSERT_ALIGNMENT(info, 64);
+		assert(ptr != old);
+		free(old);
+	}
+	free(ptr);
+
+	if (have_custom_malloc()) {
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_enaligned_reallocarray(2, NULL, 8, 1, 2));
+		assert(exit_status == 2);
+		assert_stderr("%s: aligned_reallocarray: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+
+		libsimple_default_failure_exit = 104;
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_ealigned_reallocarray(NULL, 16, 1, 2));
+		assert(exit_status == 104);
+		assert_stderr("%s: aligned_reallocarray: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+		libsimple_default_failure_exit = 1;
+	}
+
+#else
+
+	assert_exit_ptr(libsimple_enaligned_reallocarray(2, NULL, 8, 1, 2));
+	assert(exit_status == 2);
+	assert_stderr("%s: aligned_reallocarray: %s\n", argv0, strerror(ENOSYS));
+
+	libsimple_default_failure_exit = 104;
+	alloc_fail_in = 1;
+	assert_exit_ptr(libsimple_ealigned_reallocarray(NULL, 16, 1, 2));
+	assert(exit_status == 104);
+	assert_stderr("%s: aligned_reallocarray: %s\n", argv0, strerror(ENOSYS));
+	assert(!alloc_fail_in);
+	libsimple_default_failure_exit = 1;
+
+#endif
+
 	return 0;
 }