Module Name: src Committed By: riastradh Date: Sun Mar 2 00:23:59 UTC 2025
Modified Files: src/sbin/efi: devpath1.c devpath2.c devpath3.c devpath4.c devpath5.c gptsubr.c setvar.c Log Message: efi(8): Break overlong lines. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/efi/devpath1.c src/sbin/efi/devpath2.c \ src/sbin/efi/gptsubr.c cvs rdiff -u -r1.4 -r1.5 src/sbin/efi/devpath3.c src/sbin/efi/devpath4.c cvs rdiff -u -r1.1 -r1.2 src/sbin/efi/devpath5.c cvs rdiff -u -r1.2 -r1.3 src/sbin/efi/setvar.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.3 src/sbin/efi/devpath1.c:1.4 --- src/sbin/efi/devpath1.c:1.3 Sun Mar 2 00:03:41 2025 +++ src/sbin/efi/devpath1.c Sun Mar 2 00:23:59 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: devpath1.c,v 1.3 2025/03/02 00:03:41 riastradh Exp $ */ +/* $NetBSD: devpath1.c,v 1.4 2025/03/02 00:23:59 riastradh 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.3 2025/03/02 00:03:41 riastradh Exp $"); +__RCSID("$NetBSD: devpath1.c,v 1.4 2025/03/02 00:23:59 riastradh Exp $"); #endif /* not lint */ #include <sys/uuid.h> @@ -53,8 +53,9 @@ __RCSID("$NetBSD: devpath1.c,v 1.3 2025/ */ /* Used in subtype 4 */ #if 1 - #define EFI_EDD10_PATH_GUID\ - ((uuid_t){0xcf31fac5,0xc24e,0x11d2,0x85,0xf3,{0x00,0xa0,0xc9,0x3e,0xc9,0x3b}}) +#define EFI_EDD10_PATH_GUID \ + ((uuid_t){0xcf31fac5,0xc24e,0x11d2,0x85,0xf3, \ + {0x00,0xa0,0xc9,0x3e,0xc9,0x3b}}) #endif #define EFI_MEMORY_TYPE \ @@ -292,7 +293,8 @@ devpath_hw_bmc(devpath_t *dp, devpath_el iftype = devpath_hw_bmc_iftype(p->IfaceType); - path->sz = easprintf(&path->cp, "(%s,0x%016" PRIx64 ")", iftype, p->BaseAddress); + path->sz = easprintf(&path->cp, "(%s,0x%016" PRIx64 ")", + iftype, p->BaseAddress); if (dbg != NULL) { dbg->sz = easprintf(&dbg->cp, Index: src/sbin/efi/devpath2.c diff -u src/sbin/efi/devpath2.c:1.3 src/sbin/efi/devpath2.c:1.4 --- src/sbin/efi/devpath2.c:1.3 Sun Mar 2 00:03:41 2025 +++ src/sbin/efi/devpath2.c Sun Mar 2 00:23:59 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: devpath2.c,v 1.3 2025/03/02 00:03:41 riastradh Exp $ */ +/* $NetBSD: devpath2.c,v 1.4 2025/03/02 00:23:59 riastradh Exp $ */ /* * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: devpath2.c,v 1.3 2025/03/02 00:03:41 riastradh Exp $"); +__RCSID("$NetBSD: devpath2.c,v 1.4 2025/03/02 00:23:59 riastradh Exp $"); #endif /* not lint */ #include <assert.h> @@ -117,10 +117,12 @@ devpath_acpi_acpi(devpath_t *dp, devpath const char *str; str = devpath_acpi_acpi_eisaid(p->_HID); - if (str == NULL) - path->sz = easprintf(&path->cp, "ACPI(%s,0x%x)", eisaid_to_str(p->_HID), p->_UID); - else + if (str == NULL) { + path->sz = easprintf(&path->cp, "ACPI(%s,0x%x)", + eisaid_to_str(p->_HID), p->_UID); + } else { path->sz = easprintf(&path->cp, "%s(0x%x)", str, p->_UID); + } if (dbg != NULL) { dbg->sz = easprintf(&dbg->cp, Index: src/sbin/efi/gptsubr.c diff -u src/sbin/efi/gptsubr.c:1.3 src/sbin/efi/gptsubr.c:1.4 --- src/sbin/efi/gptsubr.c:1.3 Sun Mar 2 00:03:41 2025 +++ src/sbin/efi/gptsubr.c Sun Mar 2 00:23:59 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: gptsubr.c,v 1.3 2025/03/02 00:03:41 riastradh Exp $ */ +/* $NetBSD: gptsubr.c,v 1.4 2025/03/02 00:23:59 riastradh 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.3 2025/03/02 00:03:41 riastradh Exp $"); +__RCSID("$NetBSD: gptsubr.c,v 1.4 2025/03/02 00:23:59 riastradh Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -525,8 +525,12 @@ find_partition_idx(const char *fname, in printf("num_parts: %u\n", dl.d_npartitions); printf("partition %d\n", pnum); - printf(" offset = %u (%#x)\n", dl.d_partitions[pnum].p_offset, dl.d_partitions[pnum].p_offset); - printf(" size = %u (%#x)\n", dl.d_partitions[pnum].p_size, dl.d_partitions[pnum].p_size); + printf(" offset = %u (%#x)\n", + dl.d_partitions[pnum].p_offset, + dl.d_partitions[pnum].p_offset); + printf(" size = %u (%#x)\n", + dl.d_partitions[pnum].p_size, + dl.d_partitions[pnum].p_size); parent = p; // vfsbuf.f_mntfromname; offset = dl.d_partitions[pnum].p_offset; Index: src/sbin/efi/devpath3.c diff -u src/sbin/efi/devpath3.c:1.4 src/sbin/efi/devpath3.c:1.5 --- src/sbin/efi/devpath3.c:1.4 Sun Mar 2 00:03:41 2025 +++ src/sbin/efi/devpath3.c Sun Mar 2 00:23:59 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: devpath3.c,v 1.4 2025/03/02 00:03:41 riastradh Exp $ */ +/* $NetBSD: devpath3.c,v 1.5 2025/03/02 00:23:59 riastradh 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.4 2025/03/02 00:03:41 riastradh Exp $"); +__RCSID("$NetBSD: devpath3.c,v 1.5 2025/03/02 00:23:59 riastradh Exp $"); #endif /* not lint */ #include <arpa/inet.h> @@ -166,7 +166,8 @@ devpath_msg_atapi(devpath_t *dp, devpath } __packed *p = (void *)dp; __CTASSERT(sizeof(*p) == 8); - path->sz = easprintf(&path->cp, "ATAPI(%u,%u,%u)", p->IsSecondary, p->IsSlave, p->LUN); + path->sz = easprintf(&path->cp, "ATAPI(%u,%u,%u)", + p->IsSecondary, p->IsSlave, p->LUN); if (dbg != NULL) { dbg->sz = easprintf(&dbg->cp, @@ -191,7 +192,8 @@ devpath_msg_scsi(devpath_t *dp, devpath_ } __packed *p = (void *)dp; __CTASSERT(sizeof(*p) == 8); - path->sz = easprintf(&path->cp, "SCSI(%u,%u)", p->SCSITargetID, p->SCSILogicalUnitNum); + path->sz = easprintf(&path->cp, "SCSI(%u,%u)", + p->SCSITargetID, p->SCSILogicalUnitNum); if (dbg != NULL) { dbg->sz = easprintf(&dbg->cp, @@ -264,7 +266,8 @@ devpath_msg_usb(devpath_t *dp, devpath_e } __packed *p = (void *)dp; __CTASSERT(sizeof(*p) == 6); - path->sz = easprintf(&path->cp, "USB(%u,%u)", p->USBParentPortNum, p->USBInterfaceNum); + path->sz = easprintf(&path->cp, "USB(%u,%u)", + p->USBParentPortNum, p->USBInterfaceNum); if (dbg != NULL) { dbg->sz = easprintf(&dbg->cp, @@ -906,13 +909,16 @@ devpath_msg_usbclass(devpath_t *dp, devp name = usbclass_name(p->DeviceClass, p->DeviceSubClass); if (name == NULL) { - path->sz = easprintf(&path->cp, "UsbClass(0x%04x,0x%04x,0x%02x,0x%02x,0x%02x,)", + path->sz = easprintf(&path->cp, + "UsbClass(0x%04x,0x%04x,0x%02x,0x%02x,0x%02x,)", p->VendorID, p->ProductID, p->DeviceClass, p->DeviceSubClass, p->DeviceProtocol); } else if (p->DeviceClass != 254) { - path->sz = easprintf(&path->cp, "%s(0x%04x,0x%04x,0x%02x,0x%02x,)", - name, p->VendorID, p->ProductID, p->DeviceSubClass, p->DeviceProtocol); + path->sz = easprintf(&path->cp, + "%s(0x%04x,0x%04x,0x%02x,0x%02x,)", + name, p->VendorID, p->ProductID, p->DeviceSubClass, + p->DeviceProtocol); } else { path->sz = easprintf(&path->cp, "%s(0x%04x,0x%04x,0x%02x,)", @@ -1422,7 +1428,8 @@ devpath_msg_bluetoothle(devpath_t *dp, d } __packed *p = (void *)dp; __CTASSERT(sizeof(*p) == 11); - path->sz = easprintf(&path->cp, "BluetoothLE(%02x:%02x:%02x:%02x:%02x:%02x,%d)", + path->sz = easprintf(&path->cp, + "BluetoothLE(%02x:%02x:%02x:%02x:%02x:%02x,%d)", p->bdaddr[0], p->bdaddr[1], p->bdaddr[2], p->bdaddr[3], p->bdaddr[4], p->bdaddr[5], p->addr_type); @@ -1578,7 +1585,8 @@ devpath_msg_restservice(devpath_t *dp, d } __packed *p = (void *)dp; __CTASSERT(sizeof(*p) == 6); - path->sz = easprintf(&path->cp, "RestService(%d,%d)", p->RestService, p->AccessMode); + path->sz = easprintf(&path->cp, "RestService(%d,%d)", + p->RestService, p->AccessMode); if (dbg != NULL) { dbg->sz = easprintf(&dbg->cp, @@ -1591,7 +1599,8 @@ devpath_msg_restservice(devpath_t *dp, d p->RestService == REST_SERVICE_ODATA ? "OData" : "???", p->AccessMode, p->AccessMode == ACCESS_MODE_IN_BAND ? "In-Band" : - p->AccessMode == ACCESS_MODE_OUT_OF_BAND ? "Out-of-Band" : "???"); + p->AccessMode == ACCESS_MODE_OUT_OF_BAND ? "Out-of-Band" + : "???"); } } @@ -1627,13 +1636,16 @@ devpath_msg_nvmeof(devpath_t *dp, devpat case 2: case 3: uuid_snprintf(uuid_str, sizeof(uuid_str), &p->NID.uuid); - path->sz = easprintf(&path->cp, "NVMEoF(%s,%s)", p->SubsystemNQN, uuid_str); + path->sz = easprintf(&path->cp, "NVMEoF(%s,%s)", + p->SubsystemNQN, uuid_str); break; case 4: - path->sz = easprintf(&path->cp, "NVMEoF(%s,0x%02x)", p->SubsystemNQN, p->NID.csi); + path->sz = easprintf(&path->cp, "NVMEoF(%s,0x%02x)", + p->SubsystemNQN, p->NID.csi); break; default: - path->sz = easprintf(&path->cp, "NVMEoF(%s,unknown)", p->SubsystemNQN); + path->sz = easprintf(&path->cp, "NVMEoF(%s,unknown)", + p->SubsystemNQN); break; } Index: src/sbin/efi/devpath4.c diff -u src/sbin/efi/devpath4.c:1.4 src/sbin/efi/devpath4.c:1.5 --- src/sbin/efi/devpath4.c:1.4 Sun Mar 2 00:03:41 2025 +++ src/sbin/efi/devpath4.c Sun Mar 2 00:23:59 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: devpath4.c,v 1.4 2025/03/02 00:03:41 riastradh Exp $ */ +/* $NetBSD: devpath4.c,v 1.5 2025/03/02 00:23:59 riastradh 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.4 2025/03/02 00:03:41 riastradh Exp $"); +__RCSID("$NetBSD: devpath4.c,v 1.5 2025/03/02 00:23:59 riastradh Exp $"); #endif /* not lint */ #include <sys/uuid.h> @@ -226,7 +226,8 @@ devpath_media_protocol(devpath_t *dp, de } static void -devpath_media_PIWGfwfile(devpath_t *dp, devpath_elm_t *path, devpath_elm_t *dbg) +devpath_media_PIWGfwfile(devpath_t *dp, devpath_elm_t *path, + devpath_elm_t *dbg) { /* See 10.3.5.6 */ /* See UEFI PI Version 1.8 Errata A (March 5, 2024) II-8.3 */ struct { /* Sub-Type 6 */ Index: src/sbin/efi/devpath5.c diff -u src/sbin/efi/devpath5.c:1.1 src/sbin/efi/devpath5.c:1.2 --- src/sbin/efi/devpath5.c:1.1 Mon Feb 24 13:47:56 2025 +++ src/sbin/efi/devpath5.c Sun Mar 2 00:23:59 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: devpath5.c,v 1.1 2025/02/24 13:47:56 christos Exp $ */ +/* $NetBSD: devpath5.c,v 1.2 2025/03/02 00:23:59 riastradh Exp $ */ /* * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: devpath5.c,v 1.1 2025/02/24 13:47:56 christos Exp $"); +__RCSID("$NetBSD: devpath5.c,v 1.2 2025/03/02 00:23:59 riastradh Exp $"); #endif /* not lint */ #include <assert.h> @@ -97,8 +97,8 @@ devpath_bios_BBS(devpath_t *dp, devpath_ typename = devpath_bios_typename(p->DeviceType); - path->sz = easprintf(&path->cp, "BBS(%s(%#x),0x%04x,%s)", typename, p->DeviceType, - p->StatusFlag, p->Description); + path->sz = easprintf(&path->cp, "BBS(%s(%#x),0x%04x,%s)", + typename, p->DeviceType, p->StatusFlag, p->Description); if (dbg != NULL) { char statusflag[128]; Index: src/sbin/efi/setvar.c diff -u src/sbin/efi/setvar.c:1.2 src/sbin/efi/setvar.c:1.3 --- src/sbin/efi/setvar.c:1.2 Sun Mar 2 00:03:41 2025 +++ src/sbin/efi/setvar.c Sun Mar 2 00:23:59 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: setvar.c,v 1.2 2025/03/02 00:03:41 riastradh Exp $ */ +/* $NetBSD: setvar.c,v 1.3 2025/03/02 00:23:59 riastradh Exp $ */ /* * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: setvar.c,v 1.2 2025/03/02 00:03:41 riastradh Exp $"); +__RCSID("$NetBSD: setvar.c,v 1.3 2025/03/02 00:23:59 riastradh Exp $"); #endif /* not lint */ #include <sys/efiio.h> @@ -79,7 +79,8 @@ parse_csus(const char *csus, uint16_t ** } PUBLIC int -prefix_bootorder(int fd, const char *target, const char *csus, uint16_t bootnum) +prefix_bootorder(int fd, const char *target, const char *csus, + uint16_t bootnum) { struct efi_var_ioc ev; char *targetorder; @@ -121,7 +122,8 @@ prefix_bootorder(int fd, const char *tar } PUBLIC int -remove_bootorder(int fd, const char *target, const char *csus, uint16_t bootnum) +remove_bootorder(int fd, const char *target, const char *csus, + uint16_t bootnum) { struct efi_var_ioc ev; char *targetorder;