aboutsummaryrefslogtreecommitdiffstats
path: root/enreallocarray.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2022-06-11 16:37:09 +0200
committerMattias Andrée <maandree@kth.se>2022-06-11 16:37:09 +0200
commitfcfe59c1f2219408ac2a9cd84b386816ff252221 (patch)
tree0f46c009babfba2d0200ece3ecce067c548a66b6 /enreallocarray.c
parentRemove `static` from some `static inline` (diff)
downloadlibsimple-fcfe59c1f2219408ac2a9cd84b386816ff252221.tar.gz
libsimple-fcfe59c1f2219408ac2a9cd84b386816ff252221.tar.bz2
libsimple-fcfe59c1f2219408ac2a9cd84b386816ff252221.tar.xz
Fix warnings, replace some static inline with inline + extern inline, and fix glibc support
Diffstat (limited to '')
-rw-r--r--enreallocarray.c62
1 files changed, 0 insertions, 62 deletions
diff --git a/enreallocarray.c b/enreallocarray.c
index c208626..48ac9bd 100644
--- a/enreallocarray.c
+++ b/enreallocarray.c
@@ -43,66 +43,12 @@ 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)
@@ -114,14 +60,6 @@ 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)
# pragma GCC diagnostic pop
#endif