From: Jonathan Teh <30538043+jonathan-teh@users.noreply.github.com> Date: Sat, 6 Dec 2025 00:06:52 +0000 (+0000) Subject: Update orthography of IDs X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e55b2f086eccbeac40550f3c80f3c7e263e679f;p=thirdparty%2Fpciutils.git Update orthography of IDs Originally, we spelled "ID's" with an apostrophe. This is still correct, but somewhat niche spelling. --- diff --git a/Makefile b/Makefile index 6cdbf01..e34eef8 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ CROSS_COMPILE= # Support for compressed pci.ids (yes/no, default: detect) ZLIB= -# Support for resolving ID's by DNS (yes/no, default: detect) +# Support for resolving IDs by DNS (yes/no, default: detect) DNS= # Build libpci as a shared library (yes/no; or local for testing; requires GCC) diff --git a/lib/header.h b/lib/header.h index e9f3f64..21fb628 100644 --- a/lib/header.h +++ b/lib/header.h @@ -1920,7 +1920,7 @@ #define PCI_CLASS_OTHERS 0xff -/* Several ID's we need in the library */ +/* Several IDs we need in the library */ #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_VENDOR_ID_COMPAQ 0x0e11 diff --git a/lib/init.c b/lib/init.c index b0e5018..d20cb9b 100644 --- a/lib/init.c +++ b/lib/init.c @@ -442,7 +442,7 @@ pci_init_name_list_path(struct pci_access *a) static void pci_init_dns(struct pci_access *a) { - pci_define_param(a, "net.domain", PCI_ID_DOMAIN, "DNS domain used for resolving of ID's"); + pci_define_param(a, "net.domain", PCI_ID_DOMAIN, "DNS domain used for resolving of IDs"); a->id_lookup_mode = PCI_LOOKUP_CACHE; char *cache_dir = getenv("XDG_CACHE_HOME"); diff --git a/lib/names-net.c b/lib/names-net.c index 14141f4..34828cf 100644 --- a/lib/names-net.c +++ b/lib/names-net.c @@ -1,5 +1,5 @@ /* - * The PCI Library -- Resolving ID's via DNS + * The PCI Library -- Resolving IDs via DNS * * Copyright (c) 2007--2008 Martin Mares * diff --git a/lib/pci.h b/lib/pci.h index e93e991..0ef1a70 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -280,9 +280,9 @@ char *pci_filter_parse_id(struct pci_filter *, char *) PCI_ABI; int pci_filter_match(struct pci_filter *, struct pci_dev *) PCI_ABI; /* - * Conversion of PCI ID's to names (according to the pci.ids file) + * Conversion of PCI IDs to names (according to the pci.ids file) * - * Call pci_lookup_name() to identify different types of ID's: + * Call pci_lookup_name() to identify different types of IDs: * * VENDOR (vendorID) -> vendor * DEVICE (vendorID, deviceID) -> device @@ -311,7 +311,7 @@ enum pci_lookup_mode { PCI_LOOKUP_NUMERIC = 0x10000, /* Want only formatted numbers; default if access->numeric_ids is set */ PCI_LOOKUP_NO_NUMBERS = 0x20000, /* Return NULL if not found in the database; default is to print numerically */ PCI_LOOKUP_MIXED = 0x40000, /* Include both numbers and names */ - PCI_LOOKUP_NETWORK = 0x80000, /* Try to resolve unknown ID's by DNS */ + PCI_LOOKUP_NETWORK = 0x80000, /* Try to resolve unknown IDs by DNS */ PCI_LOOKUP_SKIP_LOCAL = 0x100000, /* Do not consult local database */ PCI_LOOKUP_CACHE = 0x200000, /* Consult the local cache before using DNS */ PCI_LOOKUP_REFRESH_CACHE = 0x400000, /* Forget all previously cached entries, but still allow updating the cache */ diff --git a/lspci.c b/lspci.c index aee1673..2bfc236 100644 --- a/lspci.c +++ b/lspci.c @@ -55,18 +55,18 @@ static char help_msg[] = "-P\t\tDisplay bridge path in addition to bus and device number\n" "-PP\t\tDisplay bus path in addition to bus and device number\n" "\n" -"Resolving of device ID's to names:\n" -"-n\t\tShow numeric ID's\n" -"-nn\t\tShow both textual and numeric ID's (names & numbers)\n" +"Resolving of device IDs to names:\n" +"-n\t\tShow numeric IDs\n" +"-nn\t\tShow both textual and numeric IDs (names & numbers)\n" #ifdef PCI_USE_DNS -"-q\t\tQuery the PCI ID database for unknown ID's via DNS\n" +"-q\t\tQuery the PCI ID database for unknown IDs via DNS\n" "-qq\t\tAs above, but re-query locally cached entries\n" -"-Q\t\tQuery the PCI ID database for all ID's via DNS\n" +"-Q\t\tQuery the PCI ID database for all IDs via DNS\n" #endif "\n" "Selection of devices:\n" "-s [[[[]:]]:][][.[]]\tShow only devices in selected slots\n" -"-d []:[][:]\t\tShow only devices with specified ID's\n" +"-d []:[][:]\t\tShow only devices with specified IDs\n" "\n" "Other options:\n" "-i \tUse specified ID database instead of %s\n" diff --git a/lspci.man b/lspci.man index 7907aeb..fb7c770 100644 --- a/lspci.man +++ b/lspci.man @@ -103,7 +103,7 @@ Identify PCI devices by path through each bridge, instead of by bus number. Identify PCI devices by path through each bridge, showing the bus number as well as the device number. -.SS Options to control resolving ID's to names +.SS Options to control resolving IDs to names .TP .B -n Show PCI vendor and device codes as numbers instead of looking them up in the @@ -144,7 +144,7 @@ the fourth function of each device. .TP .B -d []:[][:[:]] Show only devices with specified vendor, device, class ID, and programming interface. -The ID's are given in hexadecimal and may be omitted or given as "*", both meaning +The IDs are given in hexadecimal and may be omitted or given as "*", both meaning "any value". The class ID can contain "x" characters which stand for "any digit". .SS Other options @@ -159,7 +159,7 @@ as the PCI ID list instead of @IDSDIR@/pci.ids. Use .B -as the map of PCI ID's handled by kernel modules. By default, lspci uses +as the map of PCI IDs handled by kernel modules. By default, lspci uses .RI /lib/modules/ kernel_version /modules.pcimap. Applies only to Linux systems with recent enough module tools. .TP @@ -221,7 +221,7 @@ described in this section. All other formats are likely to change between versions of lspci. .P -All numbers are always printed in hexadecimal. If you want to process numeric ID's instead of +All numbers are always printed in hexadecimal. If you want to process numeric IDs instead of names, please add the .B -n switch. @@ -337,7 +337,7 @@ in a single record. Please avoid using this format in any new code. .SH FILES .TP .B @IDSDIR@/pci.ids -A list of all known PCI ID's (vendors, devices, classes and subclasses). Maintained +A list of all known PCI IDs (vendors, devices, classes and subclasses). Maintained at https://pci-ids.ucw.cz/, use the .B update-pciids utility to download the most recent version. @@ -346,7 +346,7 @@ utility to download the most recent version. If lspci is compiled with support for compression, this file is tried before pci.ids. .TP .B $XDG_CACHE_HOME/pci-ids -All ID's found in the DNS query mode are cached in this file. +All IDs found in the DNS query mode are cached in this file. .SH BUGS diff --git a/pcilib.man b/pcilib.man index 71e1050..9f24b8d 100644 --- a/pcilib.man +++ b/pcilib.man @@ -262,17 +262,17 @@ or only builds a read-only virtual emulated config space with information from the Configuration Manager. -.SS Parameters for resolving of ID's via DNS +.SS Parameters for resolving of IDs via DNS .TP .B net.domain DNS domain containing the ID database. .TP .B net.cache_name -Name of the file used for caching of resolved ID's. An initial +Name of the file used for caching of resolved IDs. An initial .B ~/ is expanded to the user's home directory. -.SS Parameters for resolving of ID's via UDEV's HWDB +.SS Parameters for resolving of IDs via UDEV's HWDB .TP .B hwdb.disable Disable use of HWDB if set to a non-zero value. diff --git a/setpci.man b/setpci.man index fd4495f..f0c8f0c 100644 --- a/setpci.man +++ b/setpci.man @@ -108,7 +108,7 @@ the fourth function of each device. .TP .B -d []:[][:[:]] Select devices with specified vendor, device, class ID, and programming interface. -The ID's are given in hexadecimal and may be omitted or given as "*", both meaning +The IDs are given in hexadecimal and may be omitted or given as "*", both meaning "any value". The class ID can contain "x" characters which stand for "any digit". .PP When