mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-12 06:10:10 +00:00
de0e1b45b0
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.
36 lines
1.4 KiB
C
36 lines
1.4 KiB
C
/* Increase the size of a dynamic array and clear the new part.
|
|
Copyright (C) 2017-2021 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <dynarray.h>
|
|
#include <string.h>
|
|
|
|
bool
|
|
__libc_dynarray_resize_clear (struct dynarray_header *list, size_t size,
|
|
void *scratch, size_t element_size)
|
|
{
|
|
size_t old_size = list->used;
|
|
if (!__libc_dynarray_resize (list, size, scratch, element_size))
|
|
return false;
|
|
/* __libc_dynarray_resize already checked for overflow. */
|
|
char *array = list->array;
|
|
memset (array + (old_size * element_size), 0,
|
|
(size - old_size) * element_size);
|
|
return true;
|
|
}
|
|
libc_hidden_def (__libc_dynarray_resize_clear)
|