Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cross-build: fix fake_sysctl/tzsetup #1376

Merged
merged 26 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
07d90ee
kvprintf(): Fix '+' conversion handling
sebhub Jun 14, 2024
e152944
usb: increase USB_PORT_RESET_RECOVERY
VexedUXR Jul 16, 2024
71978fa
du: Add version information to libxo output
bramton Jul 24, 2024
a0d6f89
lastlogin: Add version information to libxo output
bramton Jul 26, 2024
31ac880
iscsictl: Add version information to libxo output
bramton Jul 26, 2024
5321a35
w: Add version information to libxo output
bramton Jul 26, 2024
6e6da53
wc: Add version information to libxo output
bramton Jul 26, 2024
5c4f64b
netstat: Add version information to libxo output
bramton Aug 27, 2024
1f882a5
adduser.8: update log location + spdx
concussious Aug 1, 2024
5d889e6
amd64: move the right parenthesis to the right place
wy-chung Aug 2, 2024
7b984d5
wsp: Allow the trackpad to be used after a partially unreleased click.
MegaManSec May 27, 2024
62cf43d
wsp: Improve multi-finger touchpad usage and allow more configurations
MegaManSec May 28, 2024
8aef1cd
wsp: Use already-calculated distance of fingers for comparison.
MegaManSec Jun 10, 2024
66145c3
ntptime: Use time_t for tv_sec related variables
sebhub Aug 9, 2024
3272054
ip6addrctl.8: Reference RFC 6724 instead
jlduran Aug 10, 2024
6bfbfc8
ip6addrctl: Update the sample configuration file
jlduran Aug 11, 2024
9cb98ab
getaddrinfo.{1,3}: Cross-reference ip6addrctl(8)
jlduran Aug 22, 2024
7b9c9f8
cross-build: fix fake_sysctl/tzsetup
valpackett Aug 11, 2024
7e3b6b2
diskless.8: show in `apropos pxe` + tag SPDX
concussious Aug 12, 2024
0d8effb
growfs.8: align and alphabetize options
concussious Aug 12, 2024
a5770eb
geom.8: minor cleanup (markup, spdx, gsched)
concussious Aug 12, 2024
fe830c3
UPDATING: increase visibility of footnotes
concussious Aug 14, 2024
4c72525
ure.4: description consistencies + tag spdx
concussious Aug 14, 2024
5e6bef4
Fix "version introduced" in two manual pages
tomhukins Aug 17, 2024
3f0efe0
libefivar: Fix AcpiEx print logic
jlduran Aug 20, 2024
2b7f289
dummynet: fix pie
fichtner Jul 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -2022,6 +2022,8 @@ COMMON ITEMS:
make -DALWAYS_CHECK_MAKE buildkernel KERNCONF=YOUR_KERNEL_HERE
make -DALWAYS_CHECK_MAKE installkernel KERNCONF=YOUR_KERNEL_HERE

If you are running kernel modules from ports, see FOOTNOTE [1].

To test a kernel once
---------------------
If you just want to boot a kernel once (because you are not sure
Expand All @@ -2038,8 +2040,7 @@ COMMON ITEMS:
<make sure you have good level 0 dumps>
make buildworld
make buildkernel KERNCONF=YOUR_KERNEL_HERE
make installkernel KERNCONF=YOUR_KERNEL_HERE
[1]
make installkernel KERNCONF=YOUR_KERNEL_HERE [1]
<reboot in single user> [3]
etcupdate -p [5]
make installworld
Expand All @@ -2057,7 +2058,7 @@ COMMON ITEMS:
<make sure you have good level 0 dumps>
<boot into -stable>
make buildworld
make buildkernel KERNCONF=YOUR_KERNEL_HERE
make buildkernel KERNCONF=YOUR_KERNEL_HERE [1]
<maybe newfs current's root partition>
<mount current's root partition on directory ${CURRENT_ROOT}>
make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC
Expand All @@ -2076,8 +2077,7 @@ COMMON ITEMS:
<make sure you have good level 0 dumps>
make buildworld [9]
make buildkernel KERNCONF=YOUR_KERNEL_HERE [8]
make installkernel KERNCONF=YOUR_KERNEL_HERE
[1]
make installkernel KERNCONF=YOUR_KERNEL_HERE [1]
<reboot in single user> [3]
etcupdate -p [5]
make installworld
Expand All @@ -2097,8 +2097,10 @@ COMMON ITEMS:
messages there. If in doubt, please track -stable which has
much fewer pitfalls.

[1] If you have third party modules, such as vmware, you should disable
them at this point so they don't crash your system on
FOOTNOTES:

[1] If you have third party modules, such as drm-kmod or vmware, you
should disable them at this point so they don't crash your system on
reboot. Alternatively, you should rebuild all the modules you have in
your system and install them as well. If you are running -current, you
should seriously consider placing all sources to all the modules for
Expand Down
3 changes: 2 additions & 1 deletion lib/libc/net/getaddrinfo.3
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,8 @@ freeaddrinfo(res0);
.Xr hosts 5 ,
.Xr resolv.conf 5 ,
.Xr services 5 ,
.Xr hostname 7
.Xr hostname 7 ,
.Xr ip6addrctl 8
.Rs
.%A R. Gilligan
.%A S. Thomson
Expand Down
72 changes: 45 additions & 27 deletions lib/libefivar/efivar-dp-format.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,23 +478,41 @@
)
{
ACPI_EXTENDED_HID_DEVICE_PATH *AcpiEx;
CHAR8 *HIDStr;
CHAR8 *UIDStr;
CHAR8 *CIDStr;
char HIDText[11];
char CIDText[11];

AcpiEx = DevPath;
HIDStr = (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
UIDStr = HIDStr + AsciiStrLen (HIDStr) + 1;
CIDStr = UIDStr + AsciiStrLen (UIDStr) + 1;
UINTN CurrentLength;
CHAR8 *CurrentPos;
UINTN NextStringOffset;
CHAR8 *Strings[3];
UINT8 HidStrIndex;
UINT8 UidStrIndex;
UINT8 CidStrIndex;
UINT8 StrIndex;

HidStrIndex = 0;
UidStrIndex = 1;
CidStrIndex = 2;
AcpiEx = DevPath;
Strings[HidStrIndex] = NULL;
Strings[UidStrIndex] = NULL;
Strings[CidStrIndex] = NULL;
CurrentLength = sizeof (ACPI_EXTENDED_HID_DEVICE_PATH);

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 499 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('
CurrentPos = (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 500 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('
StrIndex = 0;
while (CurrentLength < AcpiEx->Header.Length[0] && StrIndex < ARRAY_SIZE (Strings)) {

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('

Check failure on line 502 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('
Strings[StrIndex] = CurrentPos;
NextStringOffset = AsciiStrLen (CurrentPos) + 1;
CurrentLength += NextStringOffset;
CurrentPos += NextStringOffset;
StrIndex++;
}

if (DisplayOnly) {
if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A03) ||
((EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03) && (EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08)))
{
if (AcpiEx->UID == 0) {
UefiDevicePathLibCatPrint (Str, "PciRoot(%s)", UIDStr);
if (Strings[UidStrIndex] != NULL) {
UefiDevicePathLibCatPrint (Str, "PciRoot(%s)", Strings[UidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "PciRoot(0x%x)", AcpiEx->UID);
}
Expand All @@ -502,9 +520,9 @@
return;
}

if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08) || (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08)) {

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 523 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)
if (AcpiEx->UID == 0) {
UefiDevicePathLibCatPrint (Str, "PcieRoot(%s)", UIDStr);
if (Strings[UidStrIndex] != NULL) {
UefiDevicePathLibCatPrint (Str, "PcieRoot(%s)", Strings[UidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "PcieRoot(0x%x)", AcpiEx->UID);
}
Expand Down Expand Up @@ -535,7 +553,10 @@
(AcpiEx->CID >> 16) & 0xFFFF
);

if ((*HIDStr == '\0') && (*CIDStr == '\0') && (*UIDStr != '\0')) {
if (((Strings[HidStrIndex] != NULL) && (*Strings[HidStrIndex] == '\0')) &&
((Strings[CidStrIndex] != NULL) && (*Strings[CidStrIndex] == '\0')) &&
((Strings[UidStrIndex] != NULL) && (*Strings[UidStrIndex] != '\0')))
{
//
// use AcpiExp()
//
Expand All @@ -544,36 +565,33 @@
Str,
"AcpiExp(%s,0,%s)",
HIDText,
UIDStr
Strings[UidStrIndex]
);
} else {
UefiDevicePathLibCatPrint (
Str,
"AcpiExp(%s,%s,%s)",
HIDText,
CIDText,
UIDStr
Strings[UidStrIndex]
);
}
} else {
if (DisplayOnly) {

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)

Check failure on line 580 in lib/libefivar/efivar-dp-format.c

View workflow job for this annotation

GitHub Actions / Style Checker

suspect code indent for conditional statements (4, 6)
//
// display only
//
if (AcpiEx->HID == 0) {
UefiDevicePathLibCatPrint (Str, "AcpiEx(%s,", HIDStr);
if (Strings[HidStrIndex] != NULL) {
UefiDevicePathLibCatPrint (Str, "AcpiEx(%s,", Strings[HidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "AcpiEx(%s,", HIDText);
}

if (AcpiEx->CID == 0) {
UefiDevicePathLibCatPrint (Str, "%s,", CIDStr);
if (Strings[CidStrIndex] != NULL) {
UefiDevicePathLibCatPrint (Str, "%s,", Strings[CidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "%s,", CIDText);
}

if (AcpiEx->UID == 0) {
UefiDevicePathLibCatPrint (Str, "%s)", UIDStr);
if (Strings[UidStrIndex] != NULL) {
UefiDevicePathLibCatPrint (Str, "%s)", Strings[UidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "0x%x)", AcpiEx->UID);
}
Expand All @@ -584,9 +602,9 @@
HIDText,
CIDText,
AcpiEx->UID,
HIDStr,
CIDStr,
UIDStr
Strings[HidStrIndex] != NULL ? Strings[HidStrIndex] : '\0',
Strings[CidStrIndex] != NULL ? Strings[CidStrIndex] : '\0',
Strings[UidStrIndex] != NULL ? Strings[UidStrIndex] : '\0'
);
}
}
Expand Down
20 changes: 12 additions & 8 deletions sbin/geom/core/geom.8
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.\"-
.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
.\" All rights reserved.
.\"
Expand Down Expand Up @@ -27,7 +30,7 @@
.Os
.Sh NAME
.Nm geom
.Nd "universal control utility for GEOM classes"
.Nd universal control utility for GEOM classes
.Sh SYNOPSIS
.Nm
.Ar class
Expand Down Expand Up @@ -66,15 +69,15 @@ which can be used for existing
.Nm
unaware classes.
Here is the list of standard commands:
.Bl -tag -width ".Cm status"
.Bl -tag -width indent
.It Cm help
List all available commands for the given class.
.It Cm list
Print detailed information (within the given class) about all geoms
(if no additional arguments were specified) or the given geoms.
This command is only available if the given class exists in the kernel.
Additional options include:
.Bl -tag -width ".Fl a"
.Bl -tag -width "-a"
.It Fl a
Print information for geoms without providers.
.El
Expand All @@ -84,9 +87,11 @@ Print general information (within the given class) about all geoms
This command is only available if the given class exists in the kernel.
.Pp
Additional options include:
.Bl -tag -width ".Fl s"
.Bl -tag -width "-s"
.It Fl a
When used with -g, print status for geoms without providers.
When used with
.Fl g ,
print status for geoms without providers.
.It Fl g
Report statuses for geoms instead of providers.
.It Fl s
Expand All @@ -107,7 +112,7 @@ kernel module.
.El
.Pp
Additional options include:
.Bl -tag -width ".Cm status"
.Bl -tag -width indent
.It Fl p Ar provider-name
Print detailed information about the geom which provides
.Ar provider-name .
Expand Down Expand Up @@ -170,7 +175,7 @@ VIRSTOR
.Sh ENVIRONMENT
The following environment variables affect the execution of
.Nm :
.Bl -tag -width ".Ev GEOM_LIBRARY_PATH"
.Bl -tag -width "GEOM_LIBRARY_PATH"
.It Ev GEOM_LIBRARY_PATH
Specifies the path where shared libraries are stored instead of
.Pa /lib/geom/ .
Expand Down Expand Up @@ -213,7 +218,6 @@ geom md unload
.Xr gnop 8 ,
.Xr gpart 8 ,
.Xr graid3 8 ,
.Xr gsched 8 ,
.Xr gshsec 8 ,
.Xr gstripe 8 ,
.Xr gunion 8 ,
Expand Down
12 changes: 6 additions & 6 deletions sbin/growfs/growfs.8
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,11 @@ The
.Nm
utility extends the size of the file system on the specified special file.
The following options are available:
.Bl -tag -width indent
.Bl -tag -width "-s size"
.It Fl N
.Dq Test mode .
Causes the new file system parameters to be printed out without actually
enlarging the file system.
.It Fl y
Causes
.Nm
to assume yes
as the answer to all operator questions.
.It Fl s Ar size
Determines the
.Ar size
Expand All @@ -87,6 +82,11 @@ This value defaults to the size of the raw partition specified in
(in other words,
.Nm
will enlarge the file system to the size of the entire partition).
.It Fl y
Causes
.Nm
to assume yes
as the answer to all operator questions.
.El
.Sh EXIT STATUS
Exit status is 0 on success, and >= 1 on errors.
Expand Down
2 changes: 1 addition & 1 deletion share/man/man4/acpi_ged.4
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ This may generate optionally ACPI notify for another device.
The
.Nm
device driver first appeared in
.Fx 14.0 .
.Fx 13.3 .
.Sh AUTHORS
.An -nosplit
The
Expand Down
2 changes: 1 addition & 1 deletion share/man/man4/gve.4
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ Please email gvnic-drivers@google.com with the specifics of the issue encountere
The
.Nm
device driver first appeared in
.Fx 14.0 .
.Fx 13.3 .
.Sh AUTHORS
The
.Nm
Expand Down
29 changes: 18 additions & 11 deletions share/man/man4/ure.4
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.\"-
.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2015-2016 Kevin Lo <kevlo@FreeBSD.org>
.\" All rights reserved.
Expand All @@ -23,12 +25,12 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd May 3, 2024
.Dd September 3, 2024
.Dt URE 4
.Os
.Sh NAME
.Nm ure
.Nd "RealTek RTL8152/RTL8153/RTL8153B/RTL8156/RTL8156B USB to Ethernet controller driver"
.Nd RealTek RTL8152/RTL8153/RTL8156 USB Ethernet driver
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following lines in your
Expand All @@ -52,15 +54,20 @@ if_ure_load="YES"
The
.Nm
driver provides support for USB Ethernet adapters based on the RealTek
RealTek RTL8152 and RTL8153 USB Ethernet controllers.
RTL8152, RTL8153/RTL8153B, and RTL8156/RTL8156B USB Ethernet controllers,
as well as USB Ethernet PHYs provided by
.Xr rgephy 4 .
.Pp
NICs based on the RTL8152 are capable of 10 and 100Mbps speeds.
NICs based on the RTL8153 are capable of 10, 100 and 1000Mbps operation.
NICs based on the RTL8152 are capable of 10 and 100Mbps.
NICs based on the RTL8153 or provided by
.Xr rgephy 4
are capable of 10, 100, and 1000Mbps.
NICs based on the RTL8156 are capable of 10, 100, 1000, and 2500Mbps operation.
.Pp
The
.Nm
driver supports the following media types:
.Bl -tag -width ".Cm 10baseT/UTP"
.Bl -tag -width "10baseT/UTP"
.It Cm autoselect
Enable auto selection of the media type and options.
The user can manually override
Expand All @@ -86,7 +93,7 @@ or
.Cm half-duplex
modes.
.It Cm 1000baseTX
Set 1000baseTX operation over twisted pair.
Set 1000baseTX (Gigabit Ethernet) operation over twisted pair.
The RealTek gigE chips support 1000Mbps in
.Cm full-duplex
mode only.
Expand All @@ -99,12 +106,12 @@ mode only.
.Pp
The
.Nm
driver supports the following media options:
.Bl -tag -width ".Cm full-duplex"
driver supports the following media options for 10/100 operation:
.Bl -tag -width "full-duplex"
.It Cm full-duplex
Force full duplex operation.
Force full-duplex operation.
.It Cm half-duplex
Force half duplex operation.
Force half-duplex operation.
.El
.Pp
For more information on configuring this device, see
Expand Down
Loading
Loading