> Date: Wed, 3 Jul 2013 16:51:43 +0200 (CEST)
> From: Stefan Fritsch <[email protected]>
>
> fix: cast void * to char *, fix format args for (u)int64_t
>
> (tc_frequency is unsigned)
>
> diff --git sys/arch/i386/i386/db_disasm.c sys/arch/i386/i386/db_disasm.c
> index c9446a0..e5b9f4c 100644
> --- sys/arch/i386/i386/db_disasm.c
> +++ sys/arch/i386/i386/db_disasm.c
> @@ -1192,7 +1192,7 @@ db_disasm(db_addr_t loc, boolean_t altfmt)
> if (size == WORD)
> db_printf("%s", i_name);
> else
> - db_printf("%s", ip->i_extra);
> + db_printf("%s", (char *)ip->i_extra);
> } else {
> db_printf("%s", i_name);
> if (i_size != NONE) {
ok kettenis@
> diff --git sys/arch/i386/i386/db_interface.c sys/arch/i386/i386/db_interface.c
> index 85c1ff5..c75fd89 100644
> --- sys/arch/i386/i386/db_interface.c
> +++ sys/arch/i386/i386/db_interface.c
> @@ -197,11 +197,11 @@ db_sysregs_cmd(db_expr_t addr, int have_addr, db_expr_t
> count, char *modif)
> uint16_t ldtr, tr;
>
> __asm__ __volatile__("sidt %0" : "=m" (idtr));
> - db_printf("idtr: 0x%08x/%04x\n",
> + db_printf("idtr: 0x%08x/%04llx\n",
> (unsigned int)(idtr >> 16), idtr & 0xffff);
>
> __asm__ __volatile__("sgdt %0" : "=m" (gdtr));
> - db_printf("gdtr: 0x%08x/%04x\n",
> + db_printf("gdtr: 0x%08x/%04llx\n",
> (unsigned int)(gdtr >> 16), gdtr & 0xffff);
This is a tad bit inconsistent. I'd either use %llx for both values
and get rid of the cast, or use %x and use a cast in both cases.
> diff --git sys/dev/acpi/acpithinkpad.c sys/dev/acpi/acpithinkpad.c
> index 511fc15..d0b2448 100644
> --- sys/dev/acpi/acpithinkpad.c
> +++ sys/dev/acpi/acpithinkpad.c
> @@ -347,7 +347,7 @@ thinkpad_hotkey(struct aml_node *node, int notify_type,
> void *arg)
> handled = 1;
> break;
> default:
> - printf("%s: unknown event 0x%03x\n",
> + printf("%s: unknown event 0x%03llx\n",
> DEVNAME(sc), event);
> }
> }
ok kettenis@
> diff --git sys/dev/pci/amdpm.c sys/dev/pci/amdpm.c
> index 6fea65c..9b63a60 100644
> --- sys/dev/pci/amdpm.c
> +++ sys/dev/pci/amdpm.c
> @@ -247,7 +247,7 @@ amdpm_attach(struct device *parent, struct device *self,
> void *aux)
> (cfg_reg & AMDPM_STOPTMR) == 0 &&
> (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_PBC768_PMC ||
> PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_8111_PMC)) {
> - printf(": %d-bit timer at %dHz",
> + printf(": %d-bit timer at %lluHz",
> (cfg_reg & AMDPM_TMR32) ? 32 : 24,
> amdpm_timecounter.tc_frequency);
ok kettenis@
