summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-12-05 13:55:43 +0100
committerAndreas Schneider <asn@cryptomilk.org>2013-12-05 13:55:43 +0100
commit76baedfc887b61c8b98d37b21348cb49c1545381 (patch)
tree07bd9f9f259ea05ace704aec1333e210b8813eed
parentfe9d674f431957f4068e5ad512abd7db4cf7cd35 (diff)
downloadsocket_wrapper-76baedfc887b61c8b98d37b21348cb49c1545381.tar.gz
socket_wrapper-76baedfc887b61c8b98d37b21348cb49c1545381.tar.xz
socket_wrapper-76baedfc887b61c8b98d37b21348cb49c1545381.zip
swrap: Remove deprecated functions.
-rw-r--r--src/socket_wrapper.c56
1 files changed, 0 insertions, 56 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 4009608..4f31311 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -485,62 +485,6 @@ static int swrap_enabled(void)
return swrap.enabled ? 1 : 0;
}
-#ifndef HAVE_APPLE
-static void *libc_hnd;
-
-static int libc_dlopen(void)
-{
- unsigned int i;
- int flags = RTLD_LAZY;
-
-#ifdef RTLD_DEEPBIND
- flags |= RTLD_DEEPBIND;
-#endif
-
- if (libc_hnd != NULL) {
- return 0;
- }
-
- for (libc_hnd = NULL, i = 10; libc_hnd == NULL; i--) {
- char soname[256] = {0};
-
- snprintf(soname, sizeof(soname), "%s.%u", LIBC_NAME, i);
- libc_hnd = dlopen(soname, flags);
- }
-
- if (libc_hnd == NULL) {
- SWRAP_LOG(SWRAP_LOG_ERROR,
- "Failed to dlopen %s.%u: %s\n",
- LIBC_NAME, i, dlerror());
- exit(-1);
- }
-
- return 0;
-}
-#endif
-
-static void *libc_dlsym(const char *name)
-{
- void *func;
-
-#ifdef HAVE_APPLE
- func = dlsym(RTLD_NEXT, name);
-#else
- libc_dlopen();
-
- func = dlsym(libc_hnd, name);
-#endif
-
- if (func == NULL) {
- SWRAP_LOG(SWRAP_LOG_ERROR,
- "Failed to find %s in %s: %s\n",
- name, LIBC_NAME, dlerror());
- exit(-1);
- }
-
- return func;
-}
-
static int libc_vioctl(int d, unsigned long int request, va_list ap)
{
long int args[4];