diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-09-06 07:38:10 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-09-06 07:38:33 +0200 |
| commit | dbb75513f5cf9285c77c9e55777c5c35b653f890 (patch) | |
| tree | d0802a9ec0295fcd787be0d425e522a351344767 /elf/dl-sort-maps.c | |
| parent | 183d99737298bb3200f0610fdcd1c7549c8ed560 (diff) | |
| download | glibc-dbb75513f5cf9285c77c9e55777c5c35b653f890.tar.gz glibc-dbb75513f5cf9285c77c9e55777c5c35b653f890.tar.xz glibc-dbb75513f5cf9285c77c9e55777c5c35b653f890.zip | |
elf: Rename _dl_sort_maps parameter from skip to force_first
The new implementation will not be able to skip an arbitrary number of objects. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/dl-sort-maps.c')
| -rw-r--r-- | elf/dl-sort-maps.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/elf/dl-sort-maps.c b/elf/dl-sort-maps.c index 96638d7ed1..5b550b1e94 100644 --- a/elf/dl-sort-maps.c +++ b/elf/dl-sort-maps.c @@ -27,12 +27,12 @@ If FOR_FINI is true, this is called for finishing an object. */ static void _dl_sort_maps_original (struct link_map **maps, unsigned int nmaps, - unsigned int skip, bool for_fini) + bool force_first, bool for_fini) { /* Allows caller to do the common optimization of skipping the first map, usually the main binary. */ - maps += skip; - nmaps -= skip; + maps += force_first; + nmaps -= force_first; /* A list of one element need not be sorted. */ if (nmaps <= 1) @@ -182,7 +182,7 @@ dfs_traversal (struct link_map ***rpo, struct link_map *map, static void _dl_sort_maps_dfs (struct link_map **maps, unsigned int nmaps, - unsigned int skip __attribute__ ((unused)), bool for_fini) + bool force_first __attribute__ ((unused)), bool for_fini) { for (int i = nmaps - 1; i >= 0; i--) maps[i]->l_visited = 0; @@ -286,7 +286,7 @@ _dl_sort_maps_init (void) void _dl_sort_maps (struct link_map **maps, unsigned int nmaps, - unsigned int skip, bool for_fini) + bool force_first, bool for_fini) { /* It can be tempting to use a static function pointer to store and call the current selected sorting algorithm routine, but experimentation @@ -296,9 +296,9 @@ _dl_sort_maps (struct link_map **maps, unsigned int nmaps, input cases. A simple if-case with direct function calls appears to be the fastest. */ if (__glibc_likely (GLRO(dl_dso_sort_algo) == dso_sort_algorithm_original)) - _dl_sort_maps_original (maps, nmaps, skip, for_fini); + _dl_sort_maps_original (maps, nmaps, force_first, for_fini); else - _dl_sort_maps_dfs (maps, nmaps, skip, for_fini); + _dl_sort_maps_dfs (maps, nmaps, force_first, for_fini); } #endif /* HAVE_TUNABLES. */ |