Merge tag '1.4' into since

Version 1.4

1 files changed, 1 insertions, 18 deletions

diff --git a/enmemdup.c b/enmemdup.c
index 0761f86..7a6be0e 100644
--- a/enmemdup.c
+++ b/enmemdup.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -31,29 +31,12 @@ main(void)
 	assert(!memcmp(s, "hello", 5));
 	free(s);
 
-	assert((s = libsimple_ememdup("test", 5)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 5);
-		assert(!info->zeroed);
-	}
-	assert(!memcmp(s, "test", 5));
-	free(s);
-
 	if (have_custom_malloc()) {
 		alloc_fail_in = 1;
 		assert_exit_ptr(libsimple_enmemdup(44, "hello", 2));
 		assert(exit_status == 44);
 		assert_stderr("%s: memdup: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
-
-		libsimple_default_failure_exit = 55;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_ememdup("test", 2));
-		assert(exit_status == 55);
-		assert_stderr("%s: memdup: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
 	}
 
 	return 0;