mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 05:00:15 +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.
74 lines
2.3 KiB
C
74 lines
2.3 KiB
C
/* Increase the size of a dynamic array in preparation of an emplace operation.
|
|
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 <errno.h>
|
|
#include <intprops.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
bool
|
|
__libc_dynarray_emplace_enlarge (struct dynarray_header *list,
|
|
void *scratch, size_t element_size)
|
|
{
|
|
size_t new_allocated;
|
|
if (list->allocated == 0)
|
|
{
|
|
/* No scratch buffer provided. Choose a reasonable default
|
|
size. */
|
|
if (element_size < 4)
|
|
new_allocated = 16;
|
|
else if (element_size < 8)
|
|
new_allocated = 8;
|
|
else
|
|
new_allocated = 4;
|
|
}
|
|
else
|
|
/* Increase the allocated size, using an exponential growth
|
|
policy. */
|
|
{
|
|
new_allocated = list->allocated + list->allocated / 2 + 1;
|
|
if (new_allocated <= list->allocated)
|
|
{
|
|
/* Overflow. */
|
|
__set_errno (ENOMEM);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
size_t new_size;
|
|
if (INT_MULTIPLY_WRAPV (new_allocated, element_size, &new_size))
|
|
return false;
|
|
void *new_array;
|
|
if (list->array == scratch)
|
|
{
|
|
/* The previous array was not heap-allocated. */
|
|
new_array = malloc (new_size);
|
|
if (new_array != NULL && list->array != NULL)
|
|
memcpy (new_array, list->array, list->used * element_size);
|
|
}
|
|
else
|
|
new_array = realloc (list->array, new_size);
|
|
if (new_array == NULL)
|
|
return false;
|
|
list->array = new_array;
|
|
list->allocated = new_allocated;
|
|
return true;
|
|
}
|
|
libc_hidden_def (__libc_dynarray_emplace_enlarge)
|