d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ar: test for writing 64-bit format only if symbol count is nonzero

Browse Source 
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
This commit is contained in:
Ed Maste 2019-04-22 17:25:00 +00:00
parent be7eaf979e
commit e5228a95c6
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/ar/write.c
View File

@ -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);