summaryrefslogtreecommitdiffstats
path: root/include/dlfcn.h
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-09-13 02:37:42 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-09-13 02:37:42 +0000
commitd48eca4146670ec7c07b2d85ec667bb91d263c68 (patch)
treef276bded0692638d0d40ddfd227180bc5bb7ab79 /include/dlfcn.h
parent07a485defae1ef578c5b3ce0d4373201948a7345 (diff)
downloaduClibc-alpine-d48eca4146670ec7c07b2d85ec667bb91d263c68.tar.bz2
uClibc-alpine-d48eca4146670ec7c07b2d85ec667bb91d263c68.tar.xz
Finish merge from trunk.
Diffstat (limited to 'include/dlfcn.h')
-rw-r--r--include/dlfcn.h21
1 files changed, 17 insertions, 4 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 6dc4a5ab8..282fd076c 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,5 +1,5 @@
/* User functions for run-time dynamic loading.
- Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999,2000,2001,2003,2004 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
@@ -49,18 +49,30 @@ extern void *dlopen (__const char *__file, int __mode) __THROW;
/* Unmap and close a shared object opened by `dlopen'.
The handle cannot be used again after calling `dlclose'. */
-extern int dlclose (void *__handle) __THROW;
+extern int dlclose (void *__handle) __THROW __nonnull ((1));
/* Find the run-time address in the shared object HANDLE refers to
of the symbol called NAME. */
extern void *dlsym (void *__restrict __handle,
- __const char *__restrict __name) __THROW;
+ __const char *__restrict __name) __THROW __nonnull ((2));
+
+#if 0
+#ifdef __USE_GNU
+/* Find the run-time address in the shared object HANDLE refers to
+ of the symbol called NAME with VERSION. */
+extern void *dlvsym (void *__restrict __handle,
+ __const char *__restrict __name,
+ __const char *__restrict __version)
+ __THROW __nonnull ((2, 3));
+#endif
+#endif
/* When any of the above functions fails, call this function
to return a string describing the error. Each call resets
the error string so that a following call returns null. */
extern char *dlerror (void) __THROW;
+
#ifdef __USE_GNU
/* Structure containing information about object searched using
`dladdr'. */
@@ -74,7 +86,8 @@ typedef struct
/* Fill in *INFO with the following information about ADDRESS.
Returns 0 iff no shared object's segments contain that address. */
-extern int dladdr (const void *__address, Dl_info *__info) __THROW;
+extern int dladdr (__const void *__address, Dl_info *__info)
+ __THROW __nonnull ((2));
/* Get information about the shared objects currently loaded */
extern int dlinfo (void);