From 43e9ac94719de85de232fc976420e7f18e073d93 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 7 Apr 2016 23:06:05 +0200 Subject: recent changes to GNUNET_OS-IPK logic make plugin.c obsolete --- src/util/Makefile.am | 3 +- src/util/plugin.c | 88 ---------------------------------------------------- 2 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 src/util/plugin.c (limited to 'src') diff --git a/src/util/Makefile.am b/src/util/Makefile.am index e4352852c..54f0f0e38 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -31,8 +31,7 @@ libtalerutil_la_SOURCES = \ amount.c \ crypto.c \ util.c \ - os_installation.c \ - plugin.c + os_installation.c libtalerutil_la_LIBADD = \ -lgnunetutil \ diff --git a/src/util/plugin.c b/src/util/plugin.c deleted file mode 100644 index 65c28fa2b..000000000 --- a/src/util/plugin.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2015 GNUnet e.V. - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER 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 General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, If not, see -*/ -/** - * @file util/plugin.c - * @brief Setup paths so that we can load Taler plugins - * @author Christian Grothoff - * @author Sree Harsha Totakura - */ -#include "platform.h" -#include "taler_util.h" -#include - -/** - * Libtool search path before we started. - */ -static char *old_dlsearchpath; - - -/** - * Setup libtool paths. - */ -void __attribute__ ((constructor)) -plugin_init () -{ - int err; - const char *opath; - char *path; - char *cpath; - - err = lt_dlinit (); - if (err > 0) - { - FPRINTF (stderr, - _("Initialization of plugin mechanism failed: %s!\n"), - lt_dlerror ()); - return; - } - opath = lt_dlgetsearchpath (); - if (NULL != opath) - old_dlsearchpath = GNUNET_strdup (opath); - path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBDIR); - if (NULL != path) - { - if (NULL != opath) - { - GNUNET_asprintf (&cpath, "%s:%s", opath, path); - lt_dlsetsearchpath (cpath); - GNUNET_free (path); - GNUNET_free (cpath); - } - else - { - lt_dlsetsearchpath (path); - GNUNET_free (path); - } - } -} - - -/** - * Shutdown libtool. - */ -void __attribute__ ((destructor)) -plugin_fini () -{ - lt_dlsetsearchpath (old_dlsearchpath); - if (NULL != old_dlsearchpath) - { - GNUNET_free (old_dlsearchpath); - old_dlsearchpath = NULL; - } - lt_dlexit (); -} - -/* end of plugin.c */ -- cgit v1.2.3