diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-01-11 12:03:38 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-02-09 16:57:54 -0300 |
| commit | de0e1b45b0aba18ce50de40e42028af2c50e335c (patch) | |
| tree | f664f8441cd9d2a9eb696265951ca3d01e7a5bd3 /malloc/dynarray_at_failure.c | |
| parent | c8ba52ab3350c334d6e34b1439a4c0c1431351f3 (diff) | |
| download | glibc-de0e1b45b0aba18ce50de40e42028af2c50e335c.tar glibc-de0e1b45b0aba18ce50de40e42028af2c50e335c.tar.gz glibc-de0e1b45b0aba18ce50de40e42028af2c50e335c.tar.bz2 glibc-de0e1b45b0aba18ce50de40e42028af2c50e335c.zip | |
malloc: Sync dynarray with gnulib
It syncs with gnulib version a8bac4d49. The main changes are:
- Remove the usage of anonymous union within DYNARRAY_STRUCT.
- Use DYNARRAY_FREE instead of DYNARRAY_NAME (free) so that
Gnulib does not change 'free' to 'rpl_free'.
- Use __nonnull instead of __attribute__ ((nonnull ())).
- Use __attribute_maybe_unused__ instead of
__attribute__ ((unused, nonnull (1))).
- Use of _Noreturn instead of _attribute__ ((noreturn)).
The only difference with gnulib is:
--- glibc
+++ gnulib
@@ -18,6 +18,7 @@
#include <dynarray.h>
#include <stdio.h>
+#include <stdlib.h>
void
__libc_dynarray_at_failure (size_t size, size_t index)
@@ -27,7 +28,6 @@
__snprintf (buf, sizeof (buf), "Fatal glibc error: "
"array index %zu not less than array length %zu\n",
index, size);
- __libc_fatal (buf);
#else
abort ();
#endif
It seems a wrong sync from gnulib (the code is used on loader and
thus it requires __libc_fatal instead of abort).
Checked on x86_64-linux-gnu.
Diffstat (limited to 'malloc/dynarray_at_failure.c')
| -rw-r--r-- | malloc/dynarray_at_failure.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/malloc/dynarray_at_failure.c b/malloc/dynarray_at_failure.c index d27c0aebbc..88d9ee7f50 100644 --- a/malloc/dynarray_at_failure.c +++ b/malloc/dynarray_at_failure.c @@ -22,10 +22,14 @@ void __libc_dynarray_at_failure (size_t size, size_t index) { +#ifdef _LIBC char buf[200]; __snprintf (buf, sizeof (buf), "Fatal glibc error: " "array index %zu not less than array length %zu\n", index, size); __libc_fatal (buf); +#else + abort (); +#endif } libc_hidden_def (__libc_dynarray_at_failure) |