mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
68a256c892
Make the following changes by hand, and run 'admin/merge-gnulib'. * .gitignore: Add lib/malloc/*.gl.h. * admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h directly from Gnulib, without worrying about Gnulib modules, as these files are special cases. (AVOIDED_MODULES): Remove malloc-posix. * lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4: * m4/year2038.m4: New files, copied from Gnulib. * lib/malloca.c, lib/malloca.h: * m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4: Remove. These are either no longer present in Gnulib, or are no longer needed by modules that Emacs uses. * oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first; needed for new Gnulib. * src/xmenu.c: Call emacs_abort, not abort.
66 lines
2.1 KiB
C
66 lines
2.1 KiB
C
/* Copy the dynamically-allocated area to an explicitly-sized heap allocation.
|
|
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/>. */
|
|
|
|
#ifndef _LIBC
|
|
# include <libc-config.h>
|
|
#endif
|
|
|
|
#include <dynarray.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
bool
|
|
__libc_dynarray_finalize (struct dynarray_header *list,
|
|
void *scratch, size_t element_size,
|
|
struct dynarray_finalize_result *result)
|
|
{
|
|
if (__dynarray_error (list))
|
|
/* The caller will reported the deferred error. */
|
|
return false;
|
|
|
|
size_t used = list->used;
|
|
|
|
/* Empty list. */
|
|
if (used == 0)
|
|
{
|
|
/* An empty list could still be backed by a heap-allocated
|
|
array. Free it if necessary. */
|
|
if (list->array != scratch)
|
|
free (list->array);
|
|
*result = (struct dynarray_finalize_result) { NULL, 0 };
|
|
return true;
|
|
}
|
|
|
|
size_t allocation_size = used * element_size;
|
|
void *heap_array = malloc (allocation_size);
|
|
if (heap_array != NULL)
|
|
{
|
|
/* The new array takes ownership of the strings. */
|
|
if (list->array != NULL)
|
|
memcpy (heap_array, list->array, allocation_size);
|
|
if (list->array != scratch)
|
|
free (list->array);
|
|
*result = (struct dynarray_finalize_result)
|
|
{ .array = heap_array, .length = used };
|
|
return true;
|
|
}
|
|
else
|
|
/* The caller will perform the freeing operation. */
|
|
return false;
|
|
}
|
|
libc_hidden_def (__libc_dynarray_finalize)
|