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

Reuse our roundup2() macro instead of reinventing the wheel.

Browse Source 
Obtained from:	DragonflyBSD
This commit is contained in:
Pedro F. Giffuni 2016-04-18 17:30:33 +00:00
parent 6b2d5217d7
commit c4c510be1e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/btxld/btxld.c
View File

@ -68,8 +68,6 @@ static const char rcsid[] =
#define IMPURE 1 /* Writable text */
#define MAXU32 0xffffffff /* Maximum unsigned 32-bit quantity */
#define align(x, y) (((x) + (y) - 1) & ~((y) - 1))
struct hdr {
uint32_t fmt; /* Format */
uint32_t flags; /* Bit flags */
@ -425,7 +423,7 @@ puthdr(int fd, struct hdr *hdr)
eh.p[1].p_offset = htole32(le32toh(eh.p[0].p_offset) +
le32toh(eh.p[0].p_filesz));
eh.p[1].p_vaddr = eh.p[1].p_paddr =
htole32(align(le32toh(eh.p[0].p_paddr) + le32toh(eh.p[0].p_memsz),
htole32(roundup2(le32toh(eh.p[0].p_paddr) + le32toh(eh.p[0].p_memsz),
4096));
eh.p[1].p_filesz = eh.p[1].p_memsz = htole32(hdr->data);
eh.sh[2].sh_addr = eh.p[0].p_vaddr;

4
usr.sbin/usbdump/usbdump.c
View File

@ -95,8 +95,6 @@ struct usbcap_filehdr {
uint8_t reserved[26];
} __packed;
#define HEADER_ALIGN(x,a) (((x) + (a) - 1) & ~((a) - 1))
struct header_32 {
/* capture timestamp */
uint32_t ts_sec;
@ -622,7 +620,7 @@ print_packets(uint8_t *data, const int datalen)
temp.hdrlen = hdr32->hdrlen;
temp.align = hdr32->align;
next = ptr + HEADER_ALIGN(temp.hdrlen + temp.caplen, temp.align);
next = ptr + roundup2(temp.hdrlen + temp.caplen, temp.align);
if (next <= ptr)
err(EXIT_FAILURE, "Invalid length");