diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2019-04-22 17:25:00 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2019-04-22 17:25:00 +0000 |
| commit | e5228a95c6487f7f50e552be3f1498d8464cb301 (patch) | |
| tree | c6ce84741322b52d89fcabc8e8dee63b31c30db0 /usr.bin/ar | |
| parent | be7eaf979eb1ba8e66828fd1c59eb46e1f260b11 (diff) | |
| download | src-e5228a95c6487f7f50e552be3f1498d8464cb301.tar.gz src-e5228a95c6487f7f50e552be3f1498d8464cb301.zip | |
ar: test for writing 64-bit format only if symbol count is nonzero
This is a minor simplification; if we do not have any symbols the empty
symbol table can be in 32-bit format.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=346568
Diffstat (limited to 'usr.bin/ar')
| -rw-r--r-- | usr.bin/ar/write.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c index 46bb7e5e71aa..fe6f3dec55e1 100644 --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -656,10 +656,7 @@ write_objs(struct bsdar *bsdar) * * absolute_offset = htobe32(relative_offset + size_of_pseudo_members) */ - w_sz = sizeof(uint32_t); - if (bsdar->s_so_max > UINT32_MAX) - w_sz = sizeof(uint64_t); if (bsdar->s_cnt != 0) { s_sz = (bsdar->s_cnt + 1) * sizeof(uint32_t) + bsdar->s_sn_sz; pm_sz = _ARMAG_LEN + (_ARHDR_LEN + s_sz); |