aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-deps.c
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2002-02-06 14:14:51 +0000
committerAndreas Jaeger <aj@suse.de>2002-02-06 14:14:51 +0000
commitcff26a3ed5bd059083d209d78882bd50f9c427ed (patch)
treebd661d55f99df605ece201124269192071d622be /elf/dl-deps.c
parent4d559293f7b4d3f33ff5e0fa0ea7a4351386afed (diff)
downloadglibc-cff26a3ed5bd059083d209d78882bd50f9c427ed.zip
glibc-cff26a3ed5bd059083d209d78882bd50f9c427ed.tar.gz
glibc-cff26a3ed5bd059083d209d78882bd50f9c427ed.tar.bz2
Update.
2002-02-06 Andreas Jaeger <aj@suse.de> * include/libc-symbols.h (INTUSE): Renamed from INT. * elf/dl-deps.c: Change users. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/dl-cache.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-version.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-dst.h: Likewise. * elf/dl-init.c: Likewise.
Diffstat (limited to 'elf/dl-deps.c')
-rw-r--r--elf/dl-deps.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 43a0bd8..caeadf6 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -59,10 +59,10 @@ openaux (void *a)
{
struct openaux_args *args = (struct openaux_args *) a;
- args->aux = INT(_dl_map_object) (args->map, args->name, 0,
- (args->map->l_type == lt_executable
- ? lt_library : args->map->l_type),
- args->trace_mode, 0);
+ args->aux = INTUSE(_dl_map_object) (args->map, args->name, 0,
+ (args->map->l_type == lt_executable
+ ? lt_library : args->map->l_type),
+ args->trace_mode, 0);
}
static ptrdiff_t
@@ -107,26 +107,26 @@ struct list
\
/* DST must not appear in SUID/SGID programs. */ \
if (__libc_enable_secure) \
- INT(_dl_signal_error) (0, __str, NULL, \
- N_("DST not allowed in SUID/SGID programs"));\
+ INTUSE(_dl_signal_error) (0, __str, NULL, \
+ N_("DST not allowed in SUID/SGID programs"));\
\
__newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str), \
__cnt)); \
\
- __result = INT(_dl_dst_substitute) (l, __str, __newp, 0); \
+ __result = INTUSE(_dl_dst_substitute) (l, __str, __newp, 0); \
\
if (*__result == '\0') \
{ \
/* The replacement for the DST is not known. We can't \
processed. */ \
if (fatal) \
- INT(_dl_signal_error) (0, __str, NULL, N_("\
+ INTUSE(_dl_signal_error) (0, __str, NULL, N_("\
empty dynamics string token substitution")); \
else \
{ \
/* This is for DT_AUXILIARY. */ \
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_LIBS, 0)) \
- INT(_dl_debug_printf) (N_("\
+ INTUSE(_dl_debug_printf) (N_("\
cannot load auxiliary `%s' because of empty dynamic string token " \
"substitution\n"), __str); \
continue; \
@@ -239,8 +239,8 @@ _dl_map_object_deps (struct link_map *map,
/* Store the tag in the argument structure. */
args.name = name;
- err = INT(_dl_catch_error) (&objname, &errstring, openaux,
- &args);
+ err = INTUSE(_dl_catch_error) (&objname, &errstring, openaux,
+ &args);
if (__builtin_expect (errstring != NULL, 0))
{
if (err)
@@ -291,14 +291,14 @@ _dl_map_object_deps (struct link_map *map,
/* Say that we are about to load an auxiliary library. */
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_LIBS,
0))
- INT(_dl_debug_printf) ("load auxiliary object=%s"
- " requested by file=%s\n", name,
- l->l_name[0]
- ? l->l_name : _dl_argv[0]);
+ INTUSE(_dl_debug_printf) ("load auxiliary object=%s"
+ " requested by file=%s\n", name,
+ l->l_name[0]
+ ? l->l_name : _dl_argv[0]);
/* We must be prepared that the addressed shared
object is not available. */
- err = INT(_dl_catch_error) (&objname, &errstring, openaux,
+ err = INTUSE(_dl_catch_error) (&objname, &errstring, openaux,
&args);
if (__builtin_expect (errstring != NULL, 0))
{
@@ -318,13 +318,13 @@ _dl_map_object_deps (struct link_map *map,
/* Say that we are about to load an auxiliary library. */
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_LIBS,
0))
- INT(_dl_debug_printf) ("load filtered object=%s"
- " requested by file=%s\n", name,
- l->l_name[0]
- ? l->l_name : _dl_argv[0]);
+ INTUSE(_dl_debug_printf) ("load filtered object=%s"
+ " requested by file=%s\n", name,
+ l->l_name[0]
+ ? l->l_name : _dl_argv[0]);
/* For filter objects the dependency must be available. */
- err = INT(_dl_catch_error) (&objname, &errstring, openaux,
+ err = INTUSE(_dl_catch_error) (&objname, &errstring, openaux,
&args);
if (__builtin_expect (errstring != NULL, 0))
{
@@ -453,8 +453,8 @@ _dl_map_object_deps (struct link_map *map,
l->l_initfini = (struct link_map **)
malloc ((nneeded + 1) * sizeof needed[0]);
if (l->l_initfini == NULL)
- INT(_dl_signal_error) (ENOMEM, map->l_name, NULL,
- N_("cannot allocate dependency list"));
+ INTUSE(_dl_signal_error) (ENOMEM, map->l_name, NULL,
+ N_("cannot allocate dependency list"));
l->l_initfini[0] = l;
memcpy (&l->l_initfini[1], needed, nneeded * sizeof needed[0]);
}
@@ -484,8 +484,8 @@ _dl_map_object_deps (struct link_map *map,
(struct link_map **) malloc ((2 * nlist + 1)
* sizeof (struct link_map *));
if (map->l_initfini == NULL)
- INT(_dl_signal_error) (ENOMEM, map->l_name, NULL,
- N_("cannot allocate symbol search list"));
+ INTUSE(_dl_signal_error) (ENOMEM, map->l_name, NULL,
+ N_("cannot allocate symbol search list"));
map->l_searchlist.r_list = &map->l_initfini[nlist + 1];
@@ -525,7 +525,7 @@ _dl_map_object_deps (struct link_map *map,
/* As current DT_AUXILIARY/DT_FILTER implementation needs to be
rewritten, no need to bother with prelinking the old
implementation. */
- INT(_dl_signal_error) (EINVAL, l->l_name, NULL, N_("\
+ INTUSE(_dl_signal_error) (EINVAL, l->l_name, NULL, N_("\
Filters not supported with LD_TRACE_PRELINKING"));
}
@@ -539,8 +539,8 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ (cnt
* sizeof (struct link_map *)));
if (l->l_local_scope[0] == NULL)
- INT(_dl_signal_error) (ENOMEM, map->l_name, NULL,
- N_("cannot allocate symbol search list"));
+ INTUSE(_dl_signal_error) (ENOMEM, map->l_name, NULL,
+ N_("cannot allocate symbol search list"));
l->l_local_scope[0]->r_nlist = cnt;
l->l_local_scope[0]->r_list =
(struct link_map **) (l->l_local_scope[0] + 1);
@@ -619,7 +619,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
map->l_initfini[nlist] = NULL;
if (errno_reason)
- INT(_dl_signal_error) (errno_reason == -1 ? 0 : errno_reason, objname,
+ INTUSE(_dl_signal_error) (errno_reason == -1 ? 0 : errno_reason, objname,
NULL, errstring);
}
INTDEF (_dl_map_object_deps)