Commit d8cc13dd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

extras: remove vlc_tdestroy()

This is superseded by the compat tdestroy() replacement, which is also
available outside of libvlccore.
parent 320938b4
......@@ -590,7 +590,7 @@ dnl Check for system libs needed
need_libc=false
dnl Check for usual libc functions
AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime tdestroy uselocale])
AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
AC_REPLACE_FUNCS([gettimeofday])
AC_CHECK_FUNC(fdatasync,,
......
......@@ -480,8 +480,6 @@ void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int
#endif /* HAVE_SEARCH_H */
#ifndef HAVE_TDESTROY
void tdestroy( void *root, void (*free_node)(void *nodep) );
void vlc_tdestroy( void *, void (*)(void *) );
# define tdestroy vlc_tdestroy
#endif
/* Random numbers */
......
......@@ -67,7 +67,6 @@ src/config/help.c
src/config/intf.c
src/darwin/error.c
src/extras/libc.c
src/extras/tdestroy.c
src/input/access.c
src/input/clock.c
src/input/clock.h
......
......@@ -198,7 +198,6 @@ libvlccore_la_SOURCES = \
config/getopt.c \
config/vlc_getopt.h \
extras/libc.c \
extras/tdestroy.c \
modules/modules.h \
modules/modules.c \
modules/bank.c \
......
/**
* @file tdestroy.c
* @brief replacement for GNU tdestroy()
*/
/*****************************************************************************
* Copyright (C) 2009 Rémi Denis-Courmont
*
* This program 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.
*
* This program 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 this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#if defined(HAVE_SEARCH_H) && !defined(HAVE_TDESTROY) && defined(HAVE_TFIND)
#include <stdlib.h>
#include <assert.h>
#include <vlc_common.h>
#include <search.h>
static struct
{
const void **tab;
size_t count;
vlc_mutex_t lock;
} list = { NULL, 0, VLC_STATIC_MUTEX };
static void list_nodes (const void *node, const VISIT which, const int depth)
{
(void) depth;
if (which != postorder && which != leaf)
return;
const void **tab = realloc (list.tab, sizeof (*tab) * (list.count + 1));
if (unlikely(tab == NULL))
abort ();
tab[list.count] = *(const void **)node;
list.tab = tab;
list.count++;
}
static struct
{
const void *node;
vlc_mutex_t lock;
} smallest = { NULL, VLC_STATIC_MUTEX };
static int cmp_smallest (const void *a, const void *b)
{
if (a == b)
return 0;
if (a == smallest.node)
return -1;
if (likely(b == smallest.node))
return +1;
abort ();
}
void vlc_tdestroy (void *root, void (*freenode) (void *))
{
const void **tab;
size_t count;
assert (freenode != NULL);
/* Enumerate nodes in order */
vlc_mutex_lock (&list.lock);
assert (list.count == 0);
twalk (root, list_nodes);
tab = list.tab;
count = list.count;
list.tab = NULL;
list.count = 0;
vlc_mutex_unlock (&list.lock);
/* Destroy the tree */
vlc_mutex_lock (&smallest.lock);
for (size_t i = 0; i < count; i++)
{
void *node = tab[i];
smallest.node = node;
node = tdelete (node, &root, cmp_smallest);
assert (node != NULL);
}
vlc_mutex_unlock (&smallest.lock);
assert (root == NULL);
/* Destroy the nodes */
for (size_t i = 0; i < count; i++)
freenode ((void *)(tab[i]));
free (tab);
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment