lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Fix whitespaces.

Browse Source
This commit is contained in:
Ulrich Drepper
2010-06-27 19:39:01 -07:00
parent cb636bb255
commit a3d731d344
12 changed files with 146 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
elf/Makefile
View File

@ -28,7 +28,7 @@ routines = $(dl-routines) dl-support dl-iteratephdr \
# The core dynamic linking functions are in libc for the static and # The core dynamic linking functions are in libc for the static and
# profiled libraries. # profiled libraries.
dl-routines = $(addprefix dl-,load cache lookup object reloc deps \ dl-routines = $(addprefix dl-,load cache lookup object reloc deps \
runtime error init fini debug misc \ runtime error init fini debug misc \
version profile conflict tls origin scope \ version profile conflict tls origin scope \
execstack caller open close trampoline) execstack caller open close trampoline)
all-dl-routines = $(dl-routines) $(sysdep-dl-routines) all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
@ -89,6 +89,7 @@ distribute := rtld-Rules \
unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
unload6mod1.c unload6mod2.c unload6mod3.c \ unload6mod1.c unload6mod2.c unload6mod3.c \
unload7mod1.c unload7mod2.c \ unload7mod1.c unload7mod2.c \
unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
tst-auditmod4a.c tst-auditmod4b.c \ tst-auditmod4a.c tst-auditmod4b.c \
@ -195,7 +196,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
tst-dlmodcount tst-dlopenrpath tst-deep1 \ tst-dlmodcount tst-dlopenrpath tst-deep1 \
tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
tst-audit1 tst-audit2 \ tst-audit1 tst-audit2 \
tst-stackguard1 tst-addr1 tst-thrlock \ tst-stackguard1 tst-addr1 tst-thrlock \
tst-unique1 tst-unique2 tst-unique1 tst-unique2
@ -224,7 +225,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
neededobj5 neededobj6 firstobj globalmod1 \ neededobj5 neededobj6 firstobj globalmod1 \
unload2mod unload2dep ltglobmod1 ltglobmod2 pathoptobj \ unload2mod unload2dep ltglobmod1 ltglobmod2 pathoptobj \
dblloadmod1 dblloadmod2 dblloadmod3 reldepmod5 reldepmod6 \ dblloadmod1 dblloadmod2 dblloadmod3 reldepmod5 reldepmod6 \
reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4 \ reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4 \
reldep7mod1 reldep7mod2 \ reldep7mod1 reldep7mod2 \
tst-tlsmod1 tst-tlsmod2 tst-tlsmod3 tst-tlsmod4 \ tst-tlsmod1 tst-tlsmod2 tst-tlsmod3 tst-tlsmod4 \
tst-tlsmod5 tst-tlsmod6 tst-tlsmod7 tst-tlsmod8 \ tst-tlsmod5 tst-tlsmod6 tst-tlsmod7 tst-tlsmod8 \
@ -246,6 +247,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
unload6mod1 unload6mod2 unload6mod3 \ unload6mod1 unload6mod2 unload6mod3 \
unload7mod1 unload7mod2 \ unload7mod1 unload7mod2 \
unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
order2mod1 order2mod2 order2mod3 order2mod4 \ order2mod1 order2mod2 order2mod3 order2mod4 \
tst-unique1mod1 tst-unique1mod2 \ tst-unique1mod1 tst-unique1mod2 \
tst-unique2mod1 tst-unique2mod2 tst-unique2mod1 tst-unique2mod2
@ -521,6 +523,9 @@ $(objpfx)unload6mod2.so: $(libdl)
$(objpfx)unload6mod3.so: $(libdl) $(objpfx)unload6mod3.so: $(libdl)
$(objpfx)unload7mod1.so: $(libdl) $(objpfx)unload7mod1.so: $(libdl)
$(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
$(objpfx)unload8mod3.so: $(libdl)
LDFLAGS-tst-tlsmod5.so = -nostdlib LDFLAGS-tst-tlsmod5.so = -nostdlib
LDFLAGS-tst-tlsmod6.so = -nostdlib LDFLAGS-tst-tlsmod6.so = -nostdlib
@ -822,6 +827,9 @@ $(objpfx)unload7: $(libdl)
$(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
unload7-ENV = MALLOC_PERTURB_=85 unload7-ENV = MALLOC_PERTURB_=85
$(objpfx)unload8: $(libdl)
$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
ifdef libdl ifdef libdl
$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
@ -925,11 +933,11 @@ $(objpfx)tst-dlmodcount: $(libdl)
$(objpfx)tst-dlmodcount.out: $(test-modules) $(objpfx)tst-dlmodcount.out: $(test-modules)
check-data := $(firstword $(wildcard \ check-data := $(firstword $(wildcard \
$(foreach D,$(add-ons) scripts,\ $(foreach D,$(add-ons) scripts,\
$(patsubst %,$(..)$D/data/localplt-%.data,\ $(patsubst %,$(..)$D/data/localplt-%.data,\
$(abi-name) \ $(abi-name) \
$(addsuffix -$(config-os),\ $(addsuffix -$(config-os),\
$(config-machine) \ $(config-machine) \
$(base-machine)) \ $(base-machine)) \
generic)))) generic))))
@ -941,9 +949,9 @@ endif
$(objpfx)check-localplt.out: $(objpfx)check-localplt \ $(objpfx)check-localplt.out: $(objpfx)check-localplt \
$(common-objpfx)libc.so \ $(common-objpfx)libc.so \
$(common-objpfx)math/libm.so $(thread-dso) \ $(common-objpfx)math/libm.so $(thread-dso) \
$(common-objpfx)rt/librt.so \ $(common-objpfx)rt/librt.so \
$(common-objpfx)dlfcn/libdl.so \ $(common-objpfx)dlfcn/libdl.so \
$(common-objpfx)resolv/libresolv.so \ $(common-objpfx)resolv/libresolv.so \
$(common-objpfx)crypt/libcrypt.so \ $(common-objpfx)crypt/libcrypt.so \
$(check-data) $(check-data)

11
elf/dl-close.c
View File

@ -1,5 +1,5 @@
/* Close a shared object opened by `_dl_open'. /* Close a shared object opened by `_dl_open'.
Copyright (C) 1996-2007, 2009 Free Software Foundation, Inc. Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -274,7 +274,7 @@ _dl_close_worker (struct link_map *map)
} }
#ifdef SHARED #ifdef SHARED
/* Auditing checkpoint: we have a new object. */ /* Auditing checkpoint: we remove an object. */
if (__builtin_expect (do_audit, 0)) if (__builtin_expect (do_audit, 0))
{ {
struct audit_ifaces *afct = GLRO(dl_audit); struct audit_ifaces *afct = GLRO(dl_audit);
@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
imap->l_scope_max = new_size; imap->l_scope_max = new_size;
} }
else if (new_list != NULL)
{
/* We didn't change the scope array, so reset the search
list. */
imap->l_searchlist.r_list = NULL;
imap->l_searchlist.r_nlist = 0;
}
/* The loader is gone, so mark the object as not having one. /* The loader is gone, so mark the object as not having one.
Note: l_idx != IDX_STILL_USED -> object will be removed. */ Note: l_idx != IDX_STILL_USED -> object will be removed. */

1
sunrpc/rpc_scan.h
View File

@ -104,4 +104,3 @@ void expected1(tok_kind exp1) __attribute__ ((noreturn));
void expected2(tok_kind exp1, tok_kind exp2) __attribute__ ((noreturn)); void expected2(tok_kind exp1, tok_kind exp2) __attribute__ ((noreturn));
void expected3(tok_kind exp1, tok_kind exp2, tok_kind exp3) void expected3(tok_kind exp1, tok_kind exp2, tok_kind exp3)
__attribute__ ((noreturn)); __attribute__ ((noreturn));

2
sunrpc/rpcsvc/key_prot.x
View File

@ -282,5 +282,3 @@ program KEY_PROG {
} = 2; } = 2;
} = 100029; } = 100029;

1
sunrpc/rpcsvc/klm_prot.x
View File

@ -131,4 +131,3 @@ lock request */
klm_stat KLM_UNLOCK (struct klm_unlockargs) = 4; klm_stat KLM_UNLOCK (struct klm_unlockargs) = 4;
} = 1; } = 1;
} = 100020; } = 100020;

2
sunrpc/rpcsvc/yppasswd.x
View File

@ -59,5 +59,3 @@ struct yppasswd {
string oldpass<>; /* unencrypted old password */ string oldpass<>; /* unencrypted old password */
passwd newpw; /* new passwd entry */ passwd newpw; /* new passwd entry */
}; };