Merge branch 'master' of https://ezix.org/src/pkg/lshw

lyonel · Oct 13, 2021 · dd2f9ee · dd2f9ee
2 parents 353866c + 9d9b710
commit dd2f9ee
Show file tree

Hide file tree

Showing 26 changed files with 233 additions and 124 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Installation
    - a PA-RISC-, Alpha-, IA-64- (Itanium-), PowerPC-, ARM- or x86- based machine
    - an ANSI (or close enough to ANSI compliance) C++ compiler (tested with g++ 2.95.4 and 3.x)
    - for the (optional) GTK+ graphical user interface, you will need a
-	complete GTK+ development environment (gtk3-devel on RedHat/Fedora derivatives) 
+	complete GTK+ development environment (gtk3-devel on RedHat/Fedora derivatives)
 
  2. To compile it, just use:
 
@@ -42,7 +42,7 @@ Getting help
 
  1. the lshw home page is http://lshw.ezix.org/
  2. bug reports and feature requests: http://ezix.org/project/newticket?component=lshw
- 
+
    Please make sure you include enough information in your bug report: XML output from lshw is preferred over text or HTML, indicate the affected version of lshw, your platform (i386, x86-64, PA-RISC, PowerPC, etc.) and your distribution.
 
 NOTE TO DISTRIBUTIONS

diff --git a/docs/Changelog b/docs/Changelog
@@ -3,17 +3,17 @@
   detection of SD/MMC and SDIO devices
   bug fixes
   code cleanup
-  updated data files 
+  updated data files
 * lshw B.02.18
   migrated to git
   bug fixes
   code cleanup
-  updated data files 
+  updated data files
 * lshw B.02.17
   bug fixes
   code cleanup
   improved support for FAT-formatted disks
-  updated data files 
+  updated data files
 * lshw B.02.16
   bug fixes
   code cleanup
@@ -27,7 +27,7 @@
   updated data files
 * lshw B.02.14
   bug fixes
-  support for EXT4 partitions 
+  support for EXT4 partitions
 * lshw B.02.13
   fix bug #402: properly detect 64 bit systems (even when compiled for i386)
   fix bug #401: SMP-related crash on IA-64
@@ -70,7 +70,7 @@
 * lshw B.02.09
   minor bugfixes (#26, #27)
   added support for PCI domains (#28)
-  use of /sys (sysfs) when possible for PCI devices 
+  use of /sys (sysfs) when possible for PCI devices
 *  B.02.08.01
   bugfix release for non-x86 platforms (#24)
 *  B.02.08
@@ -99,7 +99,7 @@
   the GUI now uses a GtkTextView instead of a GtkLabel
   SVG icons are now displayed for USB, Firewire, SCSI, etc.
   added support for reporting VMX (Vanderpool) capabilities (untested)
-  fixed a compilation problem with GCC 4 
+  fixed a compilation problem with GCC 4
 *  B.02.03
   added support for PA-RISC devices (IODC-controlled) on 2.6 kernels
   the GUI can now be launched by invoking lshw with the '-X' option

diff --git a/docs/TODO b/docs/TODO
@@ -9,4 +9,4 @@
  * use MPTABLE for reporting of CPUs
 
 report SSD/rotational devices: /sys/block/DEV/queue/rotational
-better handle containers
+better handle containers
diff --git a/lshw.spec.in b/lshw.spec.in
@@ -35,7 +35,7 @@ Requires: gtk3 >= 3.24
 BuildRequires: gtk3-devel >= 3.24
 
 %description gui
-lshw (Hardware Lister) is a small tool to provide detailed informaton on
+lshw (Hardware Lister) is a small tool to provide detailed information on
 the hardware configuration of the machine. It can report exact memory
 configuration, firmware version, mainboard configuration, CPU version
 and speed, cache configuration, bus speed, etc. on DMI-capable x86s

diff --git a/src/Makefile b/src/Makefile
@@ -131,7 +131,7 @@ install-gui: gui
 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui
 	$(INSTALL) -m 0644 gui/*.ui $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/ui
 	$(INSTALL) -m 0644 gui/artwork/*.svg $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
-	
+
 clean:
 	rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
 	rm -f $(addsuffix .gz,$(DATAFILES))

diff --git a/src/core/Makefile b/src/core/Makefile
@@ -23,7 +23,7 @@ lib$(PACKAGENAME).a: $(OBJS)
 	$(AR) rs $@ $^
 
 install: all
-	
+
 clean:
 	rm -f $(OBJS) lib$(PACKAGENAME).a
 

diff --git a/src/core/cdrom.cc b/src/core/cdrom.cc
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include <linux/cdrom.h>
+#include <climits>
 
 __ID("@(#) $Id$");
 

diff --git a/src/core/cpuid.cc b/src/core/cpuid.cc
@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <cstring>
 
 __ID("@(#) $Id$");
 

diff --git a/src/core/dmi.cc b/src/core/dmi.cc
@@ -1648,9 +1648,9 @@ int dmiversionrev)
                     uint64_t(data[0x1C]) << 40 | uint64_t(data[0x1B]) << 32 |
                     uint64_t(data[0x1A]) << 24 | uint64_t(data[0x19]) << 16 |
                     uint64_t(data[0x18]) << 8 | uint64_t(data[0x17]);
-          if (end - start < 512)                  // memory range is smaller thant 512KB
+          if (end - start < 512)                  // memory range is smaller than 512KB
           {
-// consider that values were expressed in megagytes
+// consider that values were expressed in megabytes
             start *= 1024;
             end *= 1024;
           }
@@ -1688,7 +1688,7 @@ int dmiversionrev)
                     uint64_t(data[0x18]) << 8 | uint64_t(data[0x17]);
           if (end - start < 512)                  // memory range is smaller than 512KB
           {
-// consider that values were expressed in megagytes
+// consider that values were expressed in megabytes
             start *= 1024;
             end *= 1024;
           }

diff --git a/src/core/fb.cc b/src/core/fb.cc
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <cstring>
 
 __ID("@(#) $Id$");
 

diff --git a/src/core/ideraid.cc b/src/core/ideraid.cc
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <dirent.h>
 #include <ctype.h>
+#include <cstring>
 #include <vector>
 #include <linux/hdreg.h>
 #include <regex.h>

diff --git a/src/core/mounts.cc b/src/core/mounts.cc
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-
+#include <cstdlib>
 
 __ID("@(#) $Id$");