Merge tag '1.4' into since

Version 1.4

1 files changed, 1 insertions, 49 deletions

diff --git a/enaligned_wcsndup.c b/enaligned_wcsndup.c
index 32cce57..b7deea0 100644
--- a/enaligned_wcsndup.c
+++ b/enaligned_wcsndup.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -32,16 +32,6 @@ main(void)
 	assert(!wmemcmp(s, L"hello", 6));
 	free(s);
 
-	assert((s = libsimple_ealigned_wcsndup(L"test", 8, SIZE_MAX)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 5 * sizeof(wchar_t) + (8 - 5 * sizeof(wchar_t) % 8) % 8);
-		assert(info->alignment == 8);
-		assert(!info->zeroed);
-	}
-	assert(!wmemcmp(s, L"test", 5));
-	free(s);
-
 	assert((s = libsimple_enaligned_wcsndup(1, L"hello", 2, 100)));
 	if (have_custom_malloc()) {
 		assert((info = get_allocinfo(s)));
@@ -52,16 +42,6 @@ main(void)
 	assert(!wmemcmp(s, L"hello", 6));
 	free(s);
 
-	assert((s = libsimple_ealigned_wcsndup(L"test", 8, 100)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 5 * sizeof(wchar_t) + (8 - 5 * sizeof(wchar_t) % 8) % 8);
-		assert(info->alignment == 8);
-		assert(!info->zeroed);
-	}
-	assert(!wmemcmp(s, L"test", 5));
-	free(s);
-
 	assert((s = libsimple_enaligned_wcsndup(1, L"hello", 2, 6)));
 	if (have_custom_malloc()) {
 		assert((info = get_allocinfo(s)));
@@ -72,16 +52,6 @@ main(void)
 	assert(!wmemcmp(s, L"hello", 6));
 	free(s);
 
-	assert((s = libsimple_ealigned_wcsndup(L"test", 8, 5)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 5 * sizeof(wchar_t) + (8 - 5 * sizeof(wchar_t) % 8) % 8);
-		assert(info->alignment == 8);
-		assert(!info->zeroed);
-	}
-	assert(!wmemcmp(s, L"test", 5));
-	free(s);
-
 	assert((s = libsimple_enaligned_wcsndup(1, L"hello", 2, 5)));
 	if (have_custom_malloc()) {
 		assert((info = get_allocinfo(s)));
@@ -92,16 +62,6 @@ main(void)
 	assert(!wmemcmp(s, L"hello", 6));
 	free(s);
 
-	assert((s = libsimple_ealigned_wcsndup(L"test", 8, 4)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 5 * sizeof(wchar_t) + (8 - 5 * sizeof(wchar_t) % 8) % 8);
-		assert(info->alignment == 8);
-		assert(!info->zeroed);
-	}
-	assert(!wmemcmp(s, L"test", 5));
-	free(s);
-
 	assert((s = libsimple_enaligned_wcsndup(1, L"hello", 2, 4)));
 	if (have_custom_malloc()) {
 		assert((info = get_allocinfo(s)));
@@ -118,14 +78,6 @@ main(void)
 		assert(exit_status == 44);
 		assert_stderr("%s: aligned_wcsndup: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
-
-		libsimple_default_failure_exit = 55;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_ealigned_wcsndup(L"test", 8, 10));
-		assert(exit_status == 55);
-		assert_stderr("%s: aligned_wcsndup: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
 	}
 
 	return 0;