diff options
| author | kib <kib@FreeBSD.org> | 2015-02-06 08:58:06 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-02-06 08:58:06 +0000 |
| commit | e0c8cbf143628871280d2a9161e582f135dd78c9 (patch) | |
| tree | 783f976acef8663b6a44138da2f53cda644afe60 /libexec | |
| parent | 88f22084bdec2071b028e365d0c658f03ba5baed (diff) | |
| download | FreeBSD-src-e0c8cbf143628871280d2a9161e582f135dd78c9.zip FreeBSD-src-e0c8cbf143628871280d2a9161e582f135dd78c9.tar.gz | |
MFC r277936:
Use powerof2(). Remove single-use variable.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 9d6087e..b129193 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -863,7 +863,6 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath, const Elf32_Word *hashval; Elf32_Word bkt, nmaskwords; int bloom_size32; - bool nmw_power2; int plttype = DT_REL; *dyn_rpath = NULL; @@ -973,16 +972,15 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath, obj->symndx_gnu = hashtab[1]; nmaskwords = hashtab[2]; bloom_size32 = (__ELF_WORD_SIZE / 32) * nmaskwords; - /* Number of bitmask words is required to be power of 2 */ - nmw_power2 = ((nmaskwords & (nmaskwords - 1)) == 0); obj->maskwords_bm_gnu = nmaskwords - 1; obj->shift2_gnu = hashtab[3]; obj->bloom_gnu = (Elf_Addr *) (hashtab + 4); obj->buckets_gnu = hashtab + 4 + bloom_size32; obj->chain_zero_gnu = obj->buckets_gnu + obj->nbuckets_gnu - obj->symndx_gnu; - obj->valid_hash_gnu = nmw_power2 && obj->nbuckets_gnu > 0 && - obj->buckets_gnu != NULL; + /* Number of bitmask words is required to be power of 2 */ + obj->valid_hash_gnu = powerof2(nmaskwords) && + obj->nbuckets_gnu > 0 && obj->buckets_gnu != NULL; } break; |
