diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2019-02-07 20:05:52 -0800 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2019-02-07 20:05:52 -0800 |
| commit | 458a54133ecdf1685c02294d812cb562fe7bf4c3 (patch) | |
| tree | f3dc3a87dfdeb5d179e3f4ef73bf74d651136432 /com32/lib/syslinux/shuffle.c | |
| parent | b40487005223a78c3bb4c300ef6c436b3f6ec1f7 (diff) | |
| download | syslinux-458a54133ecdf1685c02294d812cb562fe7bf4c3.tar.gz syslinux-458a54133ecdf1685c02294d812cb562fe7bf4c3.tar.xz syslinux-458a54133ecdf1685c02294d812cb562fe7bf4c3.zip | |
Fix all warnings, and better separate code that should not be mixedsyslinux-6.04-pre3
Clean up a number of warnings in the tree.
Refactor especially the core code so we don't end up building a bunch
of BIOS-specific code for EFI, and general build cleanups.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'com32/lib/syslinux/shuffle.c')
| -rw-r--r-- | com32/lib/syslinux/shuffle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/com32/lib/syslinux/shuffle.c b/com32/lib/syslinux/shuffle.c index 4f9c22b7..0f6042f9 100644 --- a/com32/lib/syslinux/shuffle.c +++ b/com32/lib/syslinux/shuffle.c @@ -46,7 +46,7 @@ #include <syslinux/boot.h> struct shuffle_descriptor { - uint32_t dst, src, len; + addr_t dst, src, len; }; /* @@ -105,7 +105,7 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist, syslinux_free_memmap(rxmap); - dprintf("desczone = 0x%08x, descfree = 0x%08x\n", desczone, descfree); + dprintf("desczone = 0x%08zx, descfree = 0x%08zx\n", desczone, descfree); rxmap = syslinux_dup_memmap(memmap); if (!rxmap) @@ -165,7 +165,7 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist, { addr_t descoffs = descaddr - (addr_t) dbuf; - dprintf("nmoves = %d, nzero = %d, dbuf = %p, offs = 0x%08x\n", + dprintf("nmoves = %d, nzero = %d, dbuf = %p, offs = 0x%08zx\n", nmoves, nzero, dbuf, descoffs); } #endif @@ -177,7 +177,7 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist, dp->dst = mp->dst; dp->src = mp->src; dp->len = mp->len; - dprintf2("[ %08x %08x %08x ]\n", dp->dst, dp->src, dp->len); + dprintf2("[ %08zx %08zx %08zx ]\n", dp->dst, dp->src, dp->len); dp++; np++; } @@ -188,7 +188,7 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist, dp->dst = ml->start; dp->src = (addr_t) - 1; /* bzero region */ dp->len = ml->next->start - ml->start; - dprintf2("[ %08x %08x %08x ]\n", dp->dst, dp->src, dp->len); + dprintf2("[ %08zx %08zx %08zx ]\n", dp->dst, dp->src, dp->len); dp++; np++; } |