Module Name: src
Committed By: martin
Date: Mon Feb 24 15:42:05 UTC 2025
Modified Files:
src/sbin/efi: devpath1.c devpath3.c devpath4.c gptsubr.c
Log Message:
Fix a few printf formats
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/efi/devpath1.c src/sbin/efi/devpath3.c \
src/sbin/efi/devpath4.c src/sbin/efi/gptsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/efi/devpath1.c
diff -u src/sbin/efi/devpath1.c:1.1 src/sbin/efi/devpath1.c:1.2
--- src/sbin/efi/devpath1.c:1.1 Mon Feb 24 13:47:56 2025
+++ src/sbin/efi/devpath1.c Mon Feb 24 15:42:05 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: devpath1.c,v 1.1 2025/02/24 13:47:56 christos Exp $ */
+/* $NetBSD: devpath1.c,v 1.2 2025/02/24 15:42:05 martin Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: devpath1.c,v 1.1 2025/02/24 13:47:56 christos Exp $");
+__RCSID("$NetBSD: devpath1.c,v 1.2 2025/02/24 15:42:05 martin Exp $");
#endif /* not lint */
#include <sys/uuid.h>
@@ -157,15 +157,16 @@ devpath_hw_memmap(devpath_t *dp, devpath
typename = efi_memory_type_name(p->MemoryType);
- path->sz = easprintf(&path->cp, "MemMap(%s,0x%016tx,0x%016tx)", typename,
+ path->sz = easprintf(&path->cp, "MemMap(%s,0x%016" PRIx64
+ ",0x%016" PRIx64 ")", typename,
p->StartAddress, p->EndAddress);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(MemoryType: 0x%08x(%s)\n)
- DEVPATH_FMT(StartAddress: 0x%016tx\n)
- DEVPATH_FMT(EndAddress: 0x%016tx\n),
+ DEVPATH_FMT(StartAddress:) " 0x%016" PRIx64 "\n"
+ DEVPATH_FMT(EndAddress:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
p->MemoryType, typename,
p->StartAddress,
@@ -291,13 +292,13 @@ devpath_hw_bmc(devpath_t *dp, devpath_el
iftype = devpath_hw_bmc_iftype(p->IfaceType);
- path->sz = easprintf(&path->cp, "(%s,0x%016tx)", iftype, p->BaseAddress);
+ path->sz = easprintf(&path->cp, "(%s,0x%016" PRIx64 ")", iftype, p->BaseAddress);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(IfaceType: %u(%s)\n)
- DEVPATH_FMT(BaseAddress: 0x%016tx\n),
+ DEVPATH_FMT(BaseAddress:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
p->IfaceType, iftype,
p->BaseAddress);
Index: src/sbin/efi/devpath3.c
diff -u src/sbin/efi/devpath3.c:1.1 src/sbin/efi/devpath3.c:1.2
--- src/sbin/efi/devpath3.c:1.1 Mon Feb 24 13:47:56 2025
+++ src/sbin/efi/devpath3.c Mon Feb 24 15:42:05 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: devpath3.c,v 1.1 2025/02/24 13:47:56 christos Exp $ */
+/* $NetBSD: devpath3.c,v 1.2 2025/02/24 15:42:05 martin Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: devpath3.c,v 1.1 2025/02/24 13:47:56 christos Exp $");
+__RCSID("$NetBSD: devpath3.c,v 1.2 2025/02/24 15:42:05 martin Exp $");
#endif /* not lint */
#include <arpa/inet.h>
@@ -215,14 +215,15 @@ devpath_msg_fibre(devpath_t *dp, devpath
} __packed *p = (void *)dp;
__CTASSERT(sizeof(*p) == 24);
- path->sz = easprintf(&path->cp, "Fibre(0x%016tx,0x%016tx)", p->WWName, p->LUN);
+ path->sz = easprintf(&path->cp, "Fibre(0x%016" PRIx64 ",0x%016"
+ PRIx64 ")", p->WWName, p->LUN);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(Reserved: 0x%08x\n)
- DEVPATH_FMT(WWName: 0x%016tx\n)
- DEVPATH_FMT(LUN: 0x%016tx\n),
+ DEVPATH_FMT(WWName:) " 0x%016" PRIx64 "\n"
+ DEVPATH_FMT(LUN:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
p->Reserved,
p->WWName,
@@ -240,13 +241,13 @@ devpath_msg_11394(devpath_t *dp, devpath
} __packed *p = (void *)dp;
__CTASSERT(sizeof(*p) == 16);
- path->sz = easprintf(&path->cp, "11394(0x%016lx)", p->GUID);
+ path->sz = easprintf(&path->cp, "11394(0x%016" PRIx64 ")", p->GUID);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(Reserved: 0x%08x\n)
- DEVPATH_FMT(GUID: 0x%016lx\n),
+ DEVPATH_FMT(GUID:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
p->Reserved,
p->GUID);
@@ -321,7 +322,8 @@ devpath_msg_infiniband(devpath_t *dp, de
uuid_snprintf(uuid_str, sizeof(uuid_str), &p->GUID);
- path->sz = easprintf(&path->cp, "Infiniband(%#x,%s,0x%016tx,0x%016tx,0x%016tx)",
+ path->sz = easprintf(&path->cp, "Infiniband(%#x,%s,0x%016" PRIx64
+ ",0x%016" PRIx64 ",0x%016" PRIx64 ")",
p->Flags, uuid_str, p->ServiceID, p->PortID, p->DeviceID);
if (dbg != NULL) {
@@ -334,9 +336,9 @@ devpath_msg_infiniband(devpath_t *dp, de
DEVPATH_FMT_HDR
DEVPATH_FMT(Flags: %s\n)
DEVPATH_FMT(GUID: %s\n)
- DEVPATH_FMT(ServiceID: 0x%016tx\n)
- DEVPATH_FMT(PortID: 0x%016tx\n)
- DEVPATH_FMT(DeviceID: 0x%016tx\n),
+ DEVPATH_FMT(ServiceID:) " 0x%016" PRIx64 "\n"
+ DEVPATH_FMT(PortID:) " 0x%016" PRIx64 "\n"
+ DEVPATH_FMT(DeviceID:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
flags_str, uuid_str,
p->ServiceID, p->PortID, p->DeviceID);
@@ -450,22 +452,26 @@ devpath_msg_sas(devpath_t *dp, devpath_e
* 10.67 a bit unclear.
*/
if (SASINFO_BYTES(p->info.b[0]) == 0) {
- path->sz = easprintf(&path->cp, "SAS(0x%064lx,0x%064lx)",
+ path->sz = easprintf(&path->cp, "SAS(0x%064" PRIx64
+ ",0x%064" PRIx64 ")",
htobe64(p->addr), htobe64(p->LUN));
}
else if (SASINFO_BYTES(p->info.b[0]) == 1) {
if (SASINFO_IS_SATA(p->info.b[0])) {
- path->sz = easprintf(&path->cp, "SAS(0x%064lx,0x%064lx,SATA)",
+ path->sz = easprintf(&path->cp, "SAS(0x%064" PRIx64
+ ",0x%064" PRIx64 ",SATA)",
htobe64(p->addr), htobe64(p->LUN));
}
else {
- path->sz = easprintf(&path->cp, "SAS(0x%064lx,SAS)", htobe64(p->addr));
+ path->sz = easprintf(&path->cp, "SAS(0x%064" PRIx64
+ ",SAS)", htobe64(p->addr));
}
}
else {
assert(SASINFO_BYTES(p->info.b[0]) == 2);
uint drivebay = p->info.b[1] + 1;
- path->sz = easprintf(&path->cp, "SAS(0x%064lx,0x%064lx,0x%04x,%s,%s,%s,%d,0x%04x)",
+ path->sz = easprintf(&path->cp, "SAS(0x%064" PRIx64
+ ",0x%064" PRIx64 ",0x%04x,%s,%s,%s,%d,0x%04x)",
htobe64(p->addr), htobe64(p->LUN), p->RTP,
SASINFO_SASSATA(p->info.b[0]),
SASINFO_EXTERNAL(p->info.b[0]),
@@ -483,8 +489,8 @@ devpath_msg_sas(devpath_t *dp, devpath_e
DEVPATH_FMT_HDR
DEVPATH_FMT(GUID: %s\n)
DEVPATH_FMT(resv: 0x%08x\n)
- DEVPATH_FMT(addr: 0x%064lx(0x%064lx)\n)
- DEVPATH_FMT(LUN: 0x%064lx(0x%064lx)\n)
+ DEVPATH_FMT(addr:) " 0x%064" PRIx64 "(0x%064" PRIx64 ")\n"
+ DEVPATH_FMT(LUN:) " 0x%064" PRIx64 "(0x%064" PRIx64 ")\n"
DEVPATH_FMT(info: 0x%02x 0x%02x\n)
DEVPATH_FMT(RPT: 0x%04x\n),
DEVPATH_DAT_HDR(dp),
@@ -836,14 +842,14 @@ devpath_msg_uart(devpath_t *dp, devpath_
parity = uart_parity(p->Parity);
stopbits = uart_stopbits(p->StopBits);
- path->sz = easprintf(&path->cp, "Uart(%lu,%u,%s,%s)", p->BaudRate, p->DataBits,
- parity, stopbits);
+ path->sz = easprintf(&path->cp, "Uart(%" PRIx64 ",%u,%s,%s)",
+ p->BaudRate, p->DataBits, parity, stopbits);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(Reserved: 0x%08x\n)
- DEVPATH_FMT(BaudRate: 0x%016lx\n)
+ DEVPATH_FMT(BaudRate:) " 0x%016" PRIx64 "\n"
DEVPATH_FMT(DataBits: 0x%1x\n)
DEVPATH_FMT(Parity: 0x%1x(%s)\n)
DEVPATH_FMT(StopBits: 0x%1x(%s)\n),
@@ -1104,8 +1110,8 @@ devpath_msg_iscsi(devpath_t *dp, devpath
hdrdgst = hdrdgst_name(p->LoginOptions);
proto = protocol_name(p->Protocol);
- path->sz = easprintf(&path->cp, "iSCSI(%s,0x%04x,0x%064lx,%s,%s,%s,%s)",
- p->TargetName, p->TargetPortalGrp,
+ path->sz = easprintf(&path->cp, "iSCSI(%s,0x%04x,0x%064" PRIx64
+ ",%s,%s,%s,%s)", p->TargetName, p->TargetPortalGrp,
htobe64(p->LUN), hdrdgst, datdgst, auth, proto);
if (dbg != NULL) {
@@ -1116,7 +1122,7 @@ devpath_msg_iscsi(devpath_t *dp, devpath
DEVPATH_FMT_HDR
DEVPATH_FMT(Protocol: 0x%04x(%s)\n)
DEVPATH_FMT(LoginOptions: %s\n)
- DEVPATH_FMT(LUN: 0x%064lx\n)
+ DEVPATH_FMT(LUN:) " 0x%064" PRIx64 "\n"
DEVPATH_FMT(TargetPortalGrp: 0x%04x\n)
DEVPATH_FMT(TargetName: %s\n),
DEVPATH_DAT_HDR(dp),
@@ -1161,14 +1167,14 @@ devpath_msg_fibreex(devpath_t *dp, devpa
} __packed *p = (void *)dp;
__CTASSERT(sizeof(*p) == 24);
- path->sz = easprintf(&path->cp, "FibreEx(0x%064lx,0x%064lx)",
- htobe64(p->WorldWideName), htobe64(p->LUN));
+ path->sz = easprintf(&path->cp, "FibreEx(0x%064" PRIx64 ",0x%064"
+ PRIx64 ")", htobe64(p->WorldWideName), htobe64(p->LUN));
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
- DEVPATH_FMT(WorldWideName: 0x%064lx\n)
- DEVPATH_FMT(LUN: 0x%064lx\n),
+ DEVPATH_FMT(WorldWideName:) " 0x%064" PRIx64 "\n"
+ DEVPATH_FMT(LUN:) " 0x%064" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
htobe64(p->WorldWideName),
htobe64(p->LUN));
@@ -1195,22 +1201,26 @@ devpath_msg_sasex(devpath_t *dp, devpath
* Should we share code?
*/
if (SASINFO_BYTES(p->info.b[0]) == 0) {
- path->sz = easprintf(&path->cp, "SasEx(0x%064lx,0x%064lx)",
+ path->sz = easprintf(&path->cp, "SasEx(0x%064" PRIx64
+ ",0x%064" PRIx64 ")",
htobe64(p->addr), htobe64(p->LUN));
}
else if (SASINFO_BYTES(p->info.b[0]) == 1) {
if (SASINFO_IS_SATA(p->info.b[0])) {
- path->sz = easprintf(&path->cp, "SasEx(0x%064lx,0x%064lx,SATA)",
+ path->sz = easprintf(&path->cp, "SasEx(0x%064" PRIx64
+ ",0x%064" PRIx64 ",SATA)",
htobe64(p->addr), htobe64(p->LUN));
}
else {
- path->sz = easprintf(&path->cp, "SasEx(0x%064lx,SAS)", htobe64(p->addr));
+ path->sz = easprintf(&path->cp, "SasEx(0x%064" PRIx64
+ ",SAS)", htobe64(p->addr));
}
}
else {
assert(SASINFO_BYTES(p->info.b[0]) == 2);
uint drivebay = p->info.b[1] + 1;
- path->sz = easprintf(&path->cp, "SasEx(0x%064lx,0x%064lx,0x%04x,%s,%s,%s,%d)",
+ path->sz = easprintf(&path->cp, "SasEx(0x%064" PRIx64
+ ",0x%064" PRIx64 ",0x%04x,%s,%s,%s,%d)",
htobe64(p->addr), htobe64(p->LUN), p->RTP,
SASINFO_SASSATA(p->info.b[0]),
SASINFO_EXTERNAL(p->info.b[0]),
@@ -1221,8 +1231,8 @@ devpath_msg_sasex(devpath_t *dp, devpath
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
- DEVPATH_FMT(addr: 0x%064lx(0x%064lx)\n)
- DEVPATH_FMT(LUN: 0x%064lx(0x%064lx)\n)
+ DEVPATH_FMT(addr:) " 0x%064" PRIx64 "(0x%064" PRIx64 ")\n"
+ DEVPATH_FMT(LUN:) " 0x%064" PRIx64 "(0x%064" PRIx64 ")\n"
DEVPATH_FMT(info: 0x%02x 0x%02x\n)
DEVPATH_FMT(RPT: 0x%04x\n),
DEVPATH_DAT_HDR(dp),
@@ -1256,7 +1266,7 @@ devpath_msg_nvme(devpath_t *dp, devpath_
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(NSID: 0x%08x\n)
- DEVPATH_FMT(EUI: 0x%016lx\n),
+ DEVPATH_FMT(EUI:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
p->NSID, p->EUI.val);
}
@@ -1505,7 +1515,7 @@ devpath_msg_dns(devpath_t *dp, devpath_e
tp = bp;
dbg->sz += easprintf(&bp,
"%s"
- DEVPATH_FMT(addr[%lu]:)
+ DEVPATH_FMT(addr[%zu]:)
" %02x %02x %02x %02x"
" %02x %02x %02x %02x"
" %02x %02x %02x %02x"
@@ -1615,7 +1625,8 @@ devpath_msg_nvmeof(devpath_t *dp, devpat
path->sz = easprintf(&path->cp, "NVMEoF(%s)", p->SubsystemNQN);
break;
case 1:
- path->sz = easprintf(&path->cp, "NVMEoF(%s,0x%016lx)", p->SubsystemNQN, p->NID.ieuid);
+ path->sz = easprintf(&path->cp, "NVMEoF(%s,0x%016" PRIx64
+ ")", p->SubsystemNQN, p->NID.ieuid);
break;
case 2:
case 3:
@@ -1634,7 +1645,7 @@ devpath_msg_nvmeof(devpath_t *dp, devpat
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(NIDT: 0x%02x\n)
- DEVPATH_FMT(NID: 0x%016lx%016lx\n)
+ DEVPATH_FMT(NID:) " 0x%016" PRIx64 "%016" PRIx64 "\n"
DEVPATH_FMT(SubsystemNQN: '%s'\n),
DEVPATH_DAT_HDR(dp),
p->NIDT,
Index: src/sbin/efi/devpath4.c
diff -u src/sbin/efi/devpath4.c:1.1 src/sbin/efi/devpath4.c:1.2
--- src/sbin/efi/devpath4.c:1.1 Mon Feb 24 13:47:56 2025
+++ src/sbin/efi/devpath4.c Mon Feb 24 15:42:05 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: devpath4.c,v 1.1 2025/02/24 13:47:56 christos Exp $ */
+/* $NetBSD: devpath4.c,v 1.2 2025/02/24 15:42:05 martin Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: devpath4.c,v 1.1 2025/02/24 13:47:56 christos Exp $");
+__RCSID("$NetBSD: devpath4.c,v 1.2 2025/02/24 15:42:05 martin Exp $");
#endif /* not lint */
#include <sys/uuid.h>
@@ -92,7 +92,8 @@ devpath_media_harddisk(devpath_t *dp, de
default: name_PartitionFormat = "unknown"; break;
}
- path->sz = easprintf(&path->cp, "HD(%u,%s,%s,0x%lx,0x%lx)",
+ path->sz = easprintf(&path->cp, "HD(%u,%s,%s,0x%" PRIx64 ",0x%"
+ PRIx64 ")",
p->PartitionNumber,
name_PartitionFormat,
uuid_str,
@@ -112,8 +113,8 @@ devpath_media_harddisk(devpath_t *dp, de
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(PartitionNumber: %u\n)
- DEVPATH_FMT(PartitionStart: 0x%lx\n)
- DEVPATH_FMT(PartitionSize: 0x%lx\n)
+ DEVPATH_FMT(PartitionStart:) " 0x%" PRIx64 "\n"
+ DEVPATH_FMT(PartitionSize:) " 0x%" PRIx64 "\n"
DEVPATH_FMT(PartitionSignature: %s\n)
DEVPATH_FMT(PartitionFormat: %s(%u)\n)
DEVPATH_FMT(SignatureType: %s(%u)\n),
@@ -140,15 +141,16 @@ devpath_media_cdrom(devpath_t *dp, devpa
} __packed *p = (void *)dp;
__CTASSERT(sizeof(*p) == 24);
- path->sz = easprintf(&path->cp, "CDROM(0x%x,0x%016tx,0x%016tx)", p->BootEntry,
+ path->sz = easprintf(&path->cp, "CDROM(0x%x,0x%016" PRIx64 ",0x%016"
+ PRIx64 ")", p->BootEntry,
p->PartitionStart, p->PartitionSize);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(BootEntry: 0x%04x\n)
- DEVPATH_FMT(PartitionStart: 0x%016tx\n)
- DEVPATH_FMT(PartitionSize: 0x%016tx\n),
+ DEVPATH_FMT(PartitionStart:) " 0x%016" PRIx64 "\n"
+ DEVPATH_FMT(PartitionSize:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
p->BootEntry,
p->PartitionStart,
@@ -284,15 +286,16 @@ devpath_media_reloff(devpath_t *dp, devp
} __packed *p = (void *)dp;
__CTASSERT(sizeof(*p) == 24);
- path->sz = easprintf(&path->cp, "Offset(0x%016tx,0x%016tx)",
+ path->sz = easprintf(&path->cp, "Offset(0x%016" PRIx64 ",0x%016"
+ PRIx64 ")",
p->StartingOffset, p->EndingOffset);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
DEVPATH_FMT(Reserved: 0x%08x\n)
- DEVPATH_FMT(StartingOffset: 0x%016tx\n)
- DEVPATH_FMT(EndingOffset: 0x%016tx\n),
+ DEVPATH_FMT(StartingOffset:) " 0x%016" PRIx64 "\n"
+ DEVPATH_FMT(EndingOffset:) " 0x%016" PRIx64 "\n",
DEVPATH_DAT_HDR(dp),
p->Reserved,
p->StartingOffset,
@@ -347,19 +350,20 @@ devpath_media_ramdisk(devpath_t *dp, dev
type = devpath_media_ramdisk_type(&p->GUID);
if (type != NULL)
- path->sz = easprintf(&path->cp, "%s(0x%016tx,0x%016tx,%u)",
- type,
+ path->sz = easprintf(&path->cp, "%s(0x%016" PRIx64 ",0x%016"
+ PRIx64 ",%u)", type,
p->StartingAddress, p->EndingAddress, p->Instance);
else
- path->sz = easprintf(&path->cp, "RamDisk(0x%016tx,0x%016tx,%u,%s)",
+ path->sz = easprintf(&path->cp, "RamDisk(0x%016" PRIx64
+ ",0x%016" PRIx64 ",%u,%s)",
p->StartingAddress, p->EndingAddress, p->Instance,
uuid_str);
if (dbg != NULL) {
dbg->sz = easprintf(&dbg->cp,
DEVPATH_FMT_HDR
- DEVPATH_FMT(StartingAddress: 0x%016tx\n)
- DEVPATH_FMT(EndingAddress: 0x%016tx\n)
+ DEVPATH_FMT(StartingAddress:) " 0x%016" PRIx64 "\n"
+ DEVPATH_FMT(EndingAddress:) " 0x%016" PRIx64 "\n"
DEVPATH_FMT(Instance: 0x%08x\n)
DEVPATH_FMT(GUID: %s\n),
DEVPATH_DAT_HDR(dp),
Index: src/sbin/efi/gptsubr.c
diff -u src/sbin/efi/gptsubr.c:1.1 src/sbin/efi/gptsubr.c:1.2
--- src/sbin/efi/gptsubr.c:1.1 Mon Feb 24 13:47:56 2025
+++ src/sbin/efi/gptsubr.c Mon Feb 24 15:42:05 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: gptsubr.c,v 1.1 2025/02/24 13:47:56 christos Exp $ */
+/* $NetBSD: gptsubr.c,v 1.2 2025/02/24 15:42:05 martin Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: gptsubr.c,v 1.1 2025/02/24 13:47:56 christos Exp $");
+__RCSID("$NetBSD: gptsubr.c,v 1.2 2025/02/24 15:42:05 martin Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -169,8 +169,8 @@ get_map_widths(gpt_t gpt)
}
}
- w.start = (uint)snprintf(NULL, 0, "%zx", max_start);
- w.size = (uint)snprintf(NULL, 0, "%zx", max_size);
+ w.start = (uint)snprintf(NULL, 0, "%" PRIx64, max_start);
+ w.size = (uint)snprintf(NULL, 0, "%" PRIx64, max_size);
#define MIN_WIDTH_OF(s) (sizeof(s) - 1)
if (w.type_name < MIN_WIDTH_OF("TYPE_NAME"))
@@ -268,7 +268,8 @@ show_map(map_t m, struct map_widths w)
break;
}
- printf("%2u: %*lx %*lx %08lx %36s %36s %*s %-11s %s\n",
+ printf("%2u: %*" PRIx64 " %*" PRIx64 " %08" PRIx64
+ " %36s %36s %*s %-11s %s\n",
m->map_index,
w.start,
m->map_start,
