2017-06-02 17:59:28 +08:00
|
|
|
/* Increase the size of a dynamic array in preparation of an emplace operation.
|
2022-01-02 02:54:23 +08:00
|
|
|
Copyright (C) 2017-2022 Free Software Foundation, Inc.
|
2017-06-02 17:59:28 +08:00
|
|
|
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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 13:40:42 +08:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2017-06-02 17:59:28 +08:00
|
|
|
|
|
|
|
#include <dynarray.h>
|
2017-08-31 02:10:56 +08:00
|
|
|
#include <errno.h>
|
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.
2021-01-11 23:03:38 +08:00
|
|
|
#include <intprops.h>
|
2017-06-02 17:59:28 +08:00
|
|
|
#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;
|
2017-09-06 17:25:14 +08:00
|
|
|
else if (element_size < 8)
|
2017-06-02 17:59:28 +08:00
|
|
|
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)
|
2017-08-31 02:10:56 +08:00
|
|
|
{
|
|
|
|
/* Overflow. */
|
|
|
|
__set_errno (ENOMEM);
|
|
|
|
return false;
|
|
|
|
}
|
2017-06-02 17:59:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t new_size;
|
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.
2021-01-11 23:03:38 +08:00
|
|
|
if (INT_MULTIPLY_WRAPV (new_allocated, element_size, &new_size))
|
2017-06-02 17:59:28 +08:00
|
|
|
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)
|