mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-12 16:20:06 +00:00
5a82c74822
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
64 lines
2.0 KiB
C
64 lines
2.0 KiB
C
/* Increase the size of a dynamic array.
|
|
Copyright (C) 2017-2019 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 <stdlib.h>
|
|
#include <string.h>
|
|
|
|
bool
|
|
__libc_dynarray_resize (struct dynarray_header *list, size_t size,
|
|
void *scratch, size_t element_size)
|
|
{
|
|
/* The existing allocation provides sufficient room. */
|
|
if (size <= list->allocated)
|
|
{
|
|
list->used = size;
|
|
return true;
|
|
}
|
|
|
|
/* Otherwise, use size as the new allocation size. The caller is
|
|
expected to provide the final size of the array, so there is no
|
|
over-allocation here. */
|
|
|
|
size_t new_size_bytes;
|
|
if (__builtin_mul_overflow (size, element_size, &new_size_bytes))
|
|
{
|
|
/* Overflow. */
|
|
__set_errno (ENOMEM);
|
|
return false;
|
|
}
|
|
void *new_array;
|
|
if (list->array == scratch)
|
|
{
|
|
/* The previous array was not heap-allocated. */
|
|
new_array = malloc (new_size_bytes);
|
|
if (new_array != NULL && list->array != NULL)
|
|
memcpy (new_array, list->array, list->used * element_size);
|
|
}
|
|
else
|
|
new_array = realloc (list->array, new_size_bytes);
|
|
if (new_array == NULL)
|
|
return false;
|
|
list->array = new_array;
|
|
list->allocated = size;
|
|
list->used = size;
|
|
return true;
|
|
}
|
|
libc_hidden_def (__libc_dynarray_resize)
|