diff options
author | Martin Str|mberg <ams@ludd.ltu.se> | 2014-12-18 21:34:00 -0500 |
---|---|---|
committer | Gene Cumm <gene.cumm@gmail.com> | 2015-01-05 20:43:13 -0500 |
commit | 5270b9e01c7f5220c989eff7de3dac7c2ac69dd8 (patch) | |
tree | 81fb9d0814cfdea049ac63eb7ead90beb26abb44 | |
parent | 3106dcd19061b4443c5beba4f0e09412e8d37fbe (diff) | |
download | syslinux-5270b9e01c7f5220c989eff7de3dac7c2ac69dd8.tar.gz syslinux-5270b9e01c7f5220c989eff7de3dac7c2ac69dd8.tar.xz syslinux-5270b9e01c7f5220c989eff7de3dac7c2ac69dd8.zip |
com32: Use z size specifier for printf-ing size_t variable
Use the z size specifier to printf-ing size_t variables to get rid of gcc
warning format ‘%08x’ expects type ‘unsigned int’, but argument 2 has
type ‘long unsigned int’
Author: Martin Str|mberg <ams@ludd.ltu.se>
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
-rw-r--r-- | com32/lib/syslinux/initramfs_file.c | 2 | ||||
-rw-r--r-- | com32/mboot/map.c | 2 | ||||
-rw-r--r-- | com32/menu/menumain.c | 2 | ||||
-rw-r--r-- | com32/modules/cptime.c | 2 | ||||
-rw-r--r-- | com32/modules/pmload.c | 4 | ||||
-rw-r--r-- | com32/sysdump/dmi.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/com32/lib/syslinux/initramfs_file.c b/com32/lib/syslinux/initramfs_file.c index 7eb55b5e..9f9fa753 100644 --- a/com32/lib/syslinux/initramfs_file.c +++ b/com32/lib/syslinux/initramfs_file.c @@ -126,7 +126,7 @@ int initramfs_mknod(struct initramfs *ihead, const char *filename, if (do_mkdir) bp += initramfs_mkdirs(filename, bp, bytes); - bp += sprintf(bp, "070701%08x%08x%08x%08x%08x%08x%08x%08x%08x" + bp += sprintf(bp, "070701%08x%08x%08x%08x%08x%08x%08zx%08x%08x" "%08x%08x%08x%08x", next_ino++, mode, 0, 0, 1, 0, len, 0, 1, major, minor, namelen + 1, 0); memcpy(bp, filename, namelen); diff --git a/com32/mboot/map.c b/com32/mboot/map.c index 84f3b20c..4b0baa2a 100644 --- a/com32/mboot/map.c +++ b/com32/mboot/map.c @@ -61,7 +61,7 @@ addr_t map_data(const void *data, size_t len, size_t align, int flags) return 0; } - dprintf("Mapping 0x%08x bytes (%#x pad) at 0x%08x\n", len, pad, start); + dprintf("Mapping 0x%08zx bytes (%#x pad) at 0x%08x\n", len, pad, start); if (start + len + pad > mboot_high_water_mark) mboot_high_water_mark = start + len + pad; diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c index b8cb06fd..ed72c087 100644 --- a/com32/menu/menumain.c +++ b/com32/menu/menumain.c @@ -230,7 +230,7 @@ static int ask_passwd(const char *menu_entry) for (x = 2; x <= WIDTH - 2 * PASSWD_MARGIN - 1; x++) putchar('q'); - printf("j\017\033[%d;%dH\2#12 %s \033[%d;%dH\2#13", + printf("j\017\033[%d;%zdH\2#12 %s \033[%d;%dH\2#13", PASSWD_ROW, (WIDTH - (strlen(cm->messages[MSG_PASSPROMPT]) + 2)) / 2, cm->messages[MSG_PASSPROMPT], PASSWD_ROW + 1, PASSWD_MARGIN + 3); diff --git a/com32/modules/cptime.c b/com32/modules/cptime.c index 0f5ffe61..315b9f95 100644 --- a/com32/modules/cptime.c +++ b/com32/modules/cptime.c @@ -216,7 +216,7 @@ int time_copy(char *fn, char do_simple, char do_verbose, size_t ibufsz, off_t ma print_cp_result_long(fn, bcnt, bc, ec, ibufsz, do_verbose); } if (do_verbose) - printf(" numrd %d bcnt %d bufsz %d i %d\n", numrd, bcnt, bufsz, i); + printf(" numrd %d bcnt %zd bufsz %zd i %d\n", numrd, bcnt, bufsz, i); } return rv; } /* int time_copy(char *fn, char do_simple, int bufsz, off_t maxlen) */ diff --git a/com32/modules/pmload.c b/com32/modules/pmload.c index 6808d38a..d6239ec2 100644 --- a/com32/modules/pmload.c +++ b/com32/modules/pmload.c @@ -84,10 +84,10 @@ int boot_raw(void *ptr, size_t len, addr_t where, char **argv) dprintf("Initial memory map:\n"); syslinux_dump_memmap(mmap); - dprintf("Segment at 0x%08x len 0x%08x\n", where, len); + dprintf("Segment at 0x%08x len 0x%08zx\n", where, len); if (syslinux_memmap_type(amap, where, len) != SMT_FREE) { - printf("Memory segment at 0x%08x (len 0x%08x) is unavailable\n", + printf("Memory segment at 0x%08x (len 0x%08zx) is unavailable\n", where, len); goto bail; /* Memory region unavailable */ } diff --git a/com32/sysdump/dmi.c b/com32/sysdump/dmi.c index ce25efa4..7c39b7bc 100644 --- a/com32/sysdump/dmi.c +++ b/com32/sysdump/dmi.c @@ -65,7 +65,7 @@ static void dump_smbios(struct upload_backend *be, size_t dptr) struct smbios_header smx = *smb; char filename[32]; - snprintf(filename, sizeof filename, "dmi/%05x.%08x", + snprintf(filename, sizeof filename, "dmi/%05zx.%08x", dptr, smb->dmi.tbladdr); cpio_hdr(be, MODE_FILE, smb->dmi.tbllen + 32, filename); @@ -90,7 +90,7 @@ static void dump_old_dmi(struct upload_backend *be, size_t dptr) } fake; char filename[32]; - snprintf(filename, sizeof filename, "dmi/%05x.%08x", + snprintf(filename, sizeof filename, "dmi/%05zx.%08x", dptr, dmi->tbladdr); cpio_hdr(be, MODE_FILE, dmi->tbllen + 32, filename); |