diff options
| author |   guenther <guenther@openbsd.org> | 2017-01-23 10:30:58 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2017-01-23 10:30:58 +0000 |
| commit | e5b55072b1e6135d183d8db37c08c24a274a3291 (patch) | |
| tree | 4f8bfdca1f3c8c88929ea0fcd9e32d9682d41e69 | |
| parent | Fix format string mismatches (diff) | |
| download | wireguard-openbsd-e5b55072b1e6135d183d8db37c08c24a274a3291.tar.xz wireguard-openbsd-e5b55072b1e6135d183d8db37c08c24a274a3291.zip | |
Fix format string mismatches
| -rw-r--r-- | libexec/ld.so/amd64/rtld_machine.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/arm/rtld_machine.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/mips64/rtld_machine.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/powerpc/rtld_machine.c | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libexec/ld.so/amd64/rtld_machine.c b/libexec/ld.so/amd64/rtld_machine.c index fb8a8bc0fe1..14de6c96ce9 100644 --- a/libexec/ld.so/amd64/rtld_machine.c +++ b/libexec/ld.so/amd64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.26 2016/06/21 15:25:37 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.27 2017/01/23 10:30:58 guenther Exp $ */ /* * Copyright (c) 2002,2004 Dale Rahn @@ -226,7 +226,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz) type = ELF_R_TYPE(rels->r_info); if (RELOC_ERROR(type)) { - _dl_printf("relocation error %d idx %d\n", type, i); + _dl_printf("relocation error %d idx %ld\n", type, i); _dl_exit(20); } diff --git a/libexec/ld.so/arm/rtld_machine.c b/libexec/ld.so/arm/rtld_machine.c index 4bc65bb8791..eebe35483b5 100644 --- a/libexec/ld.so/arm/rtld_machine.c +++ b/libexec/ld.so/arm/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.23 2016/06/21 15:25:37 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.24 2017/01/23 10:30:58 guenther Exp $ */ /* * Copyright (c) 2004 Dale Rahn @@ -220,7 +220,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz) type = ELF_R_TYPE(rels->r_info); if (reloc_target_flags[type] & _RF_E) { - _dl_printf(" bad relocation %d %d\n", i, type); + _dl_printf(" bad relocation %ld %d\n", i, type); _dl_exit(1); } if (type == R_TYPE(NONE)) diff --git a/libexec/ld.so/mips64/rtld_machine.c b/libexec/ld.so/mips64/rtld_machine.c index 89c30f664d8..f0ff0ebdd2f 100644 --- a/libexec/ld.so/mips64/rtld_machine.c +++ b/libexec/ld.so/mips64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.22 2016/06/18 02:40:46 guenther Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.23 2017/01/23 10:30:58 guenther Exp $ */ /* * Copyright (c) 1998-2004 Opsycon AB, Sweden. @@ -187,7 +187,7 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) gotp = object->dyn.pltgot; n = object->Dyn.info[DT_MIPS_LOCAL_GOTNO - DT_LOPROC + DT_NUM]; - DL_DEB(("loff: '%p'\n", loff)); + DL_DEB(("loff: 0x%lx\n", (unsigned long)loff)); /* * Set up pointers for run time (lazy) resolving. */ diff --git a/libexec/ld.so/powerpc/rtld_machine.c b/libexec/ld.so/powerpc/rtld_machine.c index 558877305ce..7c4cee2176d 100644 --- a/libexec/ld.so/powerpc/rtld_machine.c +++ b/libexec/ld.so/powerpc/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.59 2016/06/21 15:25:37 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.60 2017/01/23 10:30:58 guenther Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -112,7 +112,7 @@ _dl_printf("object relocation size %x, numrela %x\n", return(0); if (relrel > numrela) { - _dl_printf("relcount > numrel: %ld > %ld\n", relrel, numrela); + _dl_printf("relcount > numrel: %ld > %d\n", relrel, numrela); _dl_exit(20); } @@ -459,9 +459,9 @@ _dl_printf(" found other symbol at %x size %d\n", default: _dl_printf("%s:" - " %s: unsupported relocation '%s' %d at %x\n", + " %s: unsupported relocation '%s' %d at %p\n", __progname, object->load_name, symn, - ELF32_R_TYPE(relas->r_info), r_addr ); + ELF32_R_TYPE(relas->r_info), (char *)r_addr ); _dl_exit(1); } } |