modify ambiguous options

a1ive · Jan 5, 2025 · 7273f51 · 7273f51
1 parent 8101951
commit 7273f51
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -71,12 +71,12 @@ This command exports system, disk, SMBIOS, and network information to `report.js
   - `GUID`  
     Specify the GUID of the network interface, e.g. `{B16B00B5-CAFE-BEEF-DEAD-001453AD0529}`  
   - `FLAGS`  
-    `ACTIVE` Filter out active network interfaces.  
-    `PHYS`   Filter out physical network interfaces.  
-    `ETH`    Filter out Ethernet network interfaces.  
-    `WLAN`   Filter out IEEE 802.11 wireless addresses.  
-    `IPV4`   Filter out IPv4 addresses.  
-    `IPV6`   Filter out IPv6 addresses.  
+    `ACTIVE` Exclude inactive network interfaces.  
+    `PHYS`   Exclude virtual network interfaces.  
+    `ETH`    Include Ethernet network interfaces.  
+    `WLAN`   Include IEEE 802.11 wireless addresses.  
+    `IPV4`   Show IPv4 addresses only.  
+    `IPV6`   Show IPv6 addresses only.  
 - --acpi[=`SGN`]  
   Print ACPI info.  
   `SGN` specifies the signature of the ACPI table, e.g. `FACP` (Fixed ACPI Description Table).  
@@ -90,13 +90,13 @@ This command exports system, disk, SMBIOS, and network information to `report.js
   - `FLAGS`  
     `NO-SMART` Don't print disk S.M.A.R.T. info.  
     `PHYS`     Exclude virtual drives.  
-    `CD`       Filter out CD-ROM devices.  
-    `HD`       Filter out hard drives.  
-    `NVME`     Filter out NVMe devices.  
-    `SATA`     Filter out SATA devices.  
-    `SCSI`     Filter out SCSI devices.  
-    `SAS`      Filter out SAS devices.  
-    `USB`      Filter out USB devices.  
+    `CD`       Include CD-ROM devices.  
+    `HD`       Include hard drives.  
+    `NVME`     Include NVMe devices.  
+    `SATA`     Include SATA devices.  
+    `SCSI`     Include SCSI devices.  
+    `SAS`      Include SAS devices.  
+    `USB`      Include USB devices.  
 - --smart=`FLAG,...`  
   Specify S.M.A.R.T. features.  
   Features enabled by default:

diff --git a/libnw/cpuid.c b/libnw/cpuid.c
@@ -235,7 +235,7 @@ PrintCpuMsr(PNODE node, struct cpu_id_t* data)
 	NWL_NodeAttrSetf(node, "Temperature (C)", NAFLG_FMT_NUMERIC, "%d", info.MsrTemp);
 	NWL_NodeAttrSetf(node, "Core Voltage (V)", NAFLG_FMT_NUMERIC, "%.2lf", info.MsrVolt);
 	NWL_NodeAttrSetf(node, "Bus Clock (MHz)", NAFLG_FMT_NUMERIC, "%.2lf", info.MsrBus);
-	NWL_NodeAttrSetf(node, "Power (W)", NAFLG_FMT_NUMERIC, "%.2lf", info.MsrPower);
+	NWL_NodeAttrSetf(node, "Energy (J)", NAFLG_FMT_NUMERIC, "%.2lf", info.MsrPower);
 	NWL_NodeAttrSetf(node, "PL1 (W)", NAFLG_FMT_NUMERIC, "%.2lf", info.MsrPl1);
 	NWL_NodeAttrSetf(node, "PL2 (W)", NAFLG_FMT_NUMERIC, "%.2lf", info.MsrPl2);
 }

diff --git a/libnw/version.h b/libnw/version.h
@@ -6,8 +6,8 @@
 #define QUOTE(x) QUOTE_(x)
 
 #define NWINFO_MAJOR_VERSION 1
-#define NWINFO_MINOR_VERSION 0
-#define NWINFO_MICRO_VERSION 6
+#define NWINFO_MINOR_VERSION 1
+#define NWINFO_MICRO_VERSION 0
 #define NWINFO_BUILD_VERSION 0
 
 #define NWINFO_VERSION      NWINFO_MAJOR_VERSION,NWINFO_MINOR_VERSION,NWINFO_MICRO_VERSION,NWINFO_BUILD_VERSION

diff --git a/nwinfo.c b/nwinfo.c
@@ -27,12 +27,12 @@ static void nwinfo_help(void)
 		"    GUID           Specify the GUID of the network interface,\n"
 		"                   e.g. '{B16B00B5-CAFE-BEEF-DEAD-001453AD0529}'\n"
 		"    FLAGS:\n"
-		"      ACTIVE       Filter out active network interfaces.\n"
-		"      PHYS         Filter out physical network interfaces.\n"
-		"      ETH          Filter out Ethernet network interfaces.\n"
-		"      WLAN         Filter out IEEE 802.11 wireless addresses.\n"
-		"      IPV4         Filter out IPv4 addresses.\n"
-		"      IPV6         Filter out IPv6 addresses.\n"
+		"      ACTIVE       Exclude inactive network interfaces.\n"
+		"      PHYS         Exclude virtual network interfaces.\n"
+		"      ETH          Include Ethernet network interfaces.\n"
+		"      WLAN         Include IEEE 802.11 wireless addresses.\n"
+		"      IPV4         Show IPv4 addresses only.\n"
+		"      IPV6         Show IPv6 addresses only.\n"
 		"  --acpi[=SGN]     Print ACPI info.\n"
 		"                   SGN specifies the signature of the ACPI table,\n"
 		"                   e.g. 'FACP' (Fixed ACPI Description Table).\n"
@@ -45,13 +45,13 @@ static void nwinfo_help(void)
 		"    FLAGS:\n"
 		"      NO-SMART     Don't print disk S.M.A.R.T. info.\n"
 		"      PHYS         Exclude virtual drives.\n"
-		"      CD           Filter out CD-ROM devices.\n"
-		"      HD           Filter out hard drives.\n"
-		"      NVME         Filter out NVMe devices.\n"
-		"      SATA         Filter out SATA devices.\n"
-		"      SCSI         Filter out SCSI devices.\n"
-		"      SAS          Filter out SAS devices.\n"
-		"      USB          Filter out USB devices.\n"
+		"      CD           Include CD-ROM devices.\n"
+		"      HD           Include hard drives.\n"
+		"      NVME         Include NVMe devices.\n"
+		"      SATA         Include SATA devices.\n"
+		"      SCSI         Include SCSI devices.\n"
+		"      SAS          Include SAS devices.\n"
+		"      USB          Include USB devices.\n"
 		"  --smart=FLAG,... Specify S.M.A.R.T. features.\n"
 		"                   Features enabled by default: 'WMI', 'ATA',\n"
 		"                   'NVIDIA', 'MARVELL', 'SAT', 'SUNPLUS',\n"