Author: pfg
Date: Mon Apr 18 17:30:33 2016
New Revision: 298216
URL: https://svnweb.freebsd.org/changeset/base/298216
Log:
Reuse our roundup2() macro instead of reinventing the wheel.
Obtained from: DragonflyBSD
Modified:
head/usr.sbin/btxld/btxld.c
head/usr.sbin/usbdump/usbdump.c
Modified: head/usr.sbin/btxld/btxld.c
==============================================================================
--- head/usr.sbin/btxld/btxld.c Mon Apr 18 16:25:37 2016 (r298215)
+++ head/usr.sbin/btxld/btxld.c Mon Apr 18 17:30:33 2016 (r298216)
@@ -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;
Modified: head/usr.sbin/usbdump/usbdump.c
==============================================================================
--- head/usr.sbin/usbdump/usbdump.c Mon Apr 18 16:25:37 2016
(r298215)
+++ head/usr.sbin/usbdump/usbdump.c Mon Apr 18 17:30:33 2016
(r298216)
@@ -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 d
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");
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
