Merge tag '1.4' into since

Version 1.4

1 files changed, 3 insertions, 65 deletions

diff --git a/enreallocarray.c b/enreallocarray.c
index c208626..f0e5ddb 100644
--- a/enreallocarray.c
+++ b/enreallocarray.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -43,69 +43,15 @@ main(void)
 	}
 	free(ptr);
 
-	assert((ptr = libsimple_ereallocarray(NULL, 1, 5)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(ptr)));
-		assert(info->size == 5);
-		assert(!info->zeroed);
-		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
-		info->refcount += 1;
-	}
-	stpcpy(ptr, "test");
-	assert((ptr = libsimple_ereallocarray(old = ptr, 10, 10)));
-	assert(!strcmp(ptr, "test"));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(ptr)));
-		assert(info->size == 100);
-		assert(!info->zeroed);
-		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
-		assert(ptr != old);
-		free(old);
-	}
-	free(ptr);
-
-	assert((ptr = libsimple_reallocarray(NULL, 1, 5)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(ptr)));
-		assert(info->size == 5);
-		assert(!info->zeroed);
-		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
-		info->refcount += 1;
-	}
-	stpcpy(ptr, "test");
-	assert((ptr = libsimple_reallocarray(old = ptr, 10, 10)));
-	assert(!strcmp(ptr, "test"));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(ptr)));
-		assert(info->size == 100);
-		assert(!info->zeroed);
-		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
-		assert(ptr != old);
-		free(old);
-	}
-	free(ptr);
-
 	if (have_custom_malloc()) {
 		alloc_fail_in = 1;
 		assert_exit_ptr(libsimple_enreallocarray(2, NULL, 1, 1));
 		assert(exit_status == 2);
 		assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
-
-		libsimple_default_failure_exit = 104;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_ereallocarray(NULL, 1, 1));
-		assert(exit_status == 104);
-		assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
-
-		alloc_fail_in = 1;
-		assert(!libsimple_reallocarray(NULL, 1, 1) && errno == ENOMEM);
-		assert(!alloc_fail_in);
 	}
 
-#if defined(__GNUC__) && !defined(__clang)
+#if defined(__GNUC__) && !defined(__clang__)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Walloc-size-larger-than="
 #endif
@@ -114,15 +60,7 @@ main(void)
 	assert(exit_status == 3);
 	assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
 
-	libsimple_default_failure_exit = 4;
-	assert_exit_ptr(libsimple_ereallocarray(NULL, SIZE_MAX, SIZE_MAX));
-	assert(exit_status == 4);
-	assert_stderr("%s: reallocarray: %s\n", argv0, strerror(ENOMEM));
-	libsimple_default_failure_exit = 1;
-
-	assert(!libsimple_reallocarray(NULL, SIZE_MAX, SIZE_MAX) && errno == ENOMEM);
-
-#if defined(__GNUC__) && !defined(__clang)
+#if defined(__GNUC__) && !defined(__clang__)
 # pragma GCC diagnostic pop
 #endif