From 6128b9e8eb58d6a12d4c8a8d6a635a3f066a0127 Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Tue, 24 Aug 2021 22:09:11 +0000 Subject: [PATCH 1/3] COPYING: use identical license file as distributed by GNU License file obtained from: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt --- COPYING | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/COPYING b/COPYING index d511905c..d159169d 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it From fe0a24357d26546a9c3d6d2000ab802e618cd134 Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Tue, 24 Aug 2021 22:17:50 +0000 Subject: [PATCH 2/3] README: fix spelling --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 694b47be..010c7e25 100644 --- a/README +++ b/README @@ -105,7 +105,7 @@ TROUBLESHOOTING lm-sensors is blamed for all kinds of problems on a regular basis. While it is always possible that lm-sensors does in fact have a problem, almost everytime the problem will be elsewhere. The most likely culprit -for a problem is one of the kernel drivers prividing data to lm-sensors +for a problem is one of the kernel drivers providing data to lm-sensors or, rather, the sensors command (and libsensors). If you encounter problems, the following tests are recommended. @@ -121,7 +121,7 @@ the following tests are recommended. with the sensors command first). Again, after identifying the offending driver, record and report your results to the driver maintainer. - If this does not help, try to run ptrace on the sensors command and/or - the application using libsensors. If you find any anormalies, record + the application using libsensors. If you find any anomalies, record your results and report. From 92e1538a19e8313a19b596e6a1920fe22938fc5e Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Tue, 24 Aug 2021 22:19:37 +0000 Subject: [PATCH 3/3] Trim trailing whitespace Making sure that none of the actual test files were touched. --- CHANGES | 8 ++++---- Makefile | 8 ++++---- doc/developers/lm_sensors.lsm | 2 +- doc/fan-divisors | 2 +- doc/fancontrol.txt | 1 - doc/git | 2 +- doc/temperature-sensors | 2 +- etc/sensors-conf-convert | 2 +- etc/sensors.conf.default | 2 +- lib/test/Module.mk | 2 +- lib/test/test-scanner.c | 21 ++++++++++----------- lib/test/test-scanner.pl | 1 - 12 files changed, 25 insertions(+), 28 deletions(-) diff --git a/CHANGES b/CHANGES index 93cbd086..be4a3259 100644 --- a/CHANGES +++ b/CHANGES @@ -86,7 +86,7 @@ git HEAD and LM95235 Add detection of NCT7802Y Print kernel version and processor information - Add detection of NCT6792D + Add detection of NCT6792D Add reference to nct6683 driver Show that NCT6102D/6104D/6106D are supported by nct6775 driver Show NCT5573D as compatible to NCT6776F with same chip ID @@ -379,7 +379,7 @@ git HEAD Move help section to sensors.conf.5 Add a section for the Asus/Fintek F8000 sensors-detect: Fix detection of ADT7463 and LM96000 - Add VIA VX800/VX820 SMBus support + Add VIA VX800/VX820 SMBus support Fix detection of Intel 5000 series FB-DIMM AMB Fix detection of ADT7462 Fix detection of SMSC LPC47M292 @@ -529,7 +529,7 @@ git HEAD Mention the f75375s driver Add SMSC LPC47B367-NC detection (no sensors) Reduce w83781d/lm78 I2C address probing range - Add Intel Celeron 4xx and Penryn (CPU on 45nm) detection + Add Intel Celeron 4xx and Penryn (CPU on 45nm) detection 3.0.0-rc3 (2007-10-28) libsensors: Add a default configuration file @@ -562,7 +562,7 @@ git HEAD Better handling of the fault flags sensors-conf-convert: Add a short help text sensors-detect: Fix SMSC SCH311x detection - Add AMD K10 CPU sensor detection + Add AMD K10 CPU sensor detection 3.0.0-rc1 (2007-09-25) Initial release diff --git a/Makefile b/Makefile index 47ffe788..95d9a080 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ BINDIR := $(PREFIX)/bin SBINDIR := $(PREFIX)/sbin # You should not need to change this. It is the basic directory into which -# include files will be installed. The actual directory will be +# include files will be installed. The actual directory will be # $(INCLUDEDIR)/sensors for library include files. INCLUDEDIR := $(PREFIX)/include LIBINCLUDEDIR := $(INCLUDEDIR)/sensors @@ -103,9 +103,9 @@ BUILD_STATIC_LIB := 1 # Within each Module.mk, rules and dependencies can be added to targets # all, install and clean. Use double colons instead of single ones -# to do this. +# to do this. -# The subdirectories we need to build things in +# The subdirectories we need to build things in SRCDIRS := lib prog/detect prog/pwm \ prog/sensors ${PROG_EXTRA:%=prog/%} etc # Only build isadump and isaset on x86 machines. @@ -166,7 +166,7 @@ LIBCFLAGS := -fpic -D_REENTRANT $(ALL_CFLAGS) all:: # Include all makefiles for sub-modules -INCLUDEFILES := +INCLUDEFILES := include $(patsubst %,%/Module.mk,$(SRCDIRS)) ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),uninstall) diff --git a/doc/developers/lm_sensors.lsm b/doc/developers/lm_sensors.lsm index 84898115..599b85e0 100644 --- a/doc/developers/lm_sensors.lsm +++ b/doc/developers/lm_sensors.lsm @@ -2,7 +2,7 @@ Begin4 Title: lm_sensors Version: 3.6.0 Entered-date: 2019-10-18 -Description: Hardware health monitoring package for Linux. It consists of +Description: Hardware health monitoring package for Linux. It consists of a library to allow applications to read sensors data more easily, and of an example program to pretty print this data. Also included is a fan speed control script. diff --git a/doc/fan-divisors b/doc/fan-divisors index 978f5a30..c2486bfb 100644 --- a/doc/fan-divisors +++ b/doc/fan-divisors @@ -20,7 +20,7 @@ Does my monitoring chip use fan divisors? 16 bits, so divisors are no longer required. In that case, you won't see "div" values in the output of sensors, and nothing needs to be configured: - + CPU1 Fan: 2160 RPM (min = 800 RPM) CPU2 Fan: 0 RPM (min = 799 RPM) ALARM Front3 Fan: 0 RPM (min = 0 RPM) diff --git a/doc/fancontrol.txt b/doc/fancontrol.txt index 337460e8..f422d9ab 100644 --- a/doc/fancontrol.txt +++ b/doc/fancontrol.txt @@ -1,4 +1,3 @@ - fancontrol - automated software based fan speed regulation diff --git a/doc/git b/doc/git index beeaedd8..2d442d88 100644 --- a/doc/git +++ b/doc/git @@ -1,4 +1,4 @@ -Git Repository +Git Repository Anonymous access to our git repository is available. This means that users can have direct access to up-to-the-minute code. diff --git a/doc/temperature-sensors b/doc/temperature-sensors index 2eccb98e..560c5289 100644 --- a/doc/temperature-sensors +++ b/doc/temperature-sensors @@ -77,7 +77,7 @@ For diodes, voltage is linear with temperature. Winbond W83782D and W83783S --------------------------- These chips default to thermistors with Beta = 3435. -Each sensor on the chip can be individually set to be +Each sensor on the chip can be individually set to be a diode, transistor, or thermistor. If the temperature reading changes much less than expected, the sensor type probably needs to be changed to a diode. diff --git a/etc/sensors-conf-convert b/etc/sensors-conf-convert index 8e8a03e0..dac398c6 100755 --- a/etc/sensors-conf-convert +++ b/etc/sensors-conf-convert @@ -425,7 +425,7 @@ if (m/^([\s#]*bus\s+"?i2c-\d+"?\s+"([^"]+)")\s+"[^"]*"/) { print STDERR "Processing bus statement: $2\n" if $debug; if ($2 eq "ISA main adapter") { - $_ = ''; # Drop entirely + $_ = ''; # Drop entirely } else { $_ = "$1\n"; # Drop algorithm name } diff --git a/etc/sensors.conf.default b/etc/sensors.conf.default index 693a66b4..fd4e2269 100644 --- a/etc/sensors.conf.default +++ b/etc/sensors.conf.default @@ -227,7 +227,7 @@ chip "smsc47m192-*" chip "lm85-*" "lm85b-*" "lm85c-*" "adm1027-*" "adt7463-*" "adt7468-*" \ - "emc6d100-*" "emc6d102-*" "emc6d103-*" "emc6d103s-*" + "emc6d100-*" "emc6d102-*" "emc6d103-*" "emc6d103s-*" label in1 "Vcore" label in2 "+3.3V" diff --git a/lib/test/Module.mk b/lib/test/Module.mk index 2a9f6edc..d1e953c6 100644 --- a/lib/test/Module.mk +++ b/lib/test/Module.mk @@ -19,6 +19,6 @@ user :: all-lib-test $(LIB_TEST_DIR)/test-scanner.ro: $(LIB_DIR)/data.h $(LIB_DIR)/conf.h $(LIB_DIR)/conf-parse.h $(LIB_DIR)/scanner.h clean-lib-test: - $(RM) $(LIB_TEST_DIR)/*.rd $(LIB_TEST_DIR)/*.ro + $(RM) $(LIB_TEST_DIR)/*.rd $(LIB_TEST_DIR)/*.ro $(RM) $(LIB_TEST_TARGETS) clean :: clean-lib-test diff --git a/lib/test/test-scanner.c b/lib/test/test-scanner.c index 4b4c7584..011255db 100644 --- a/lib/test/test-scanner.c +++ b/lib/test/test-scanner.c @@ -49,44 +49,44 @@ int main(void) case NEG: printf("NEG\n"); break; - + case EOL: printf("EOL\n"); break; - + case BUS: printf("BUS\n"); break; - + case LABEL: printf("LABEL\n"); break; - + case SET: printf("SET\n"); break; - + case CHIP: printf("CHIP\n"); break; - + case COMPUTE: printf("COMPUTE\n"); break; - + case IGNORE: printf("IGNORE\n"); break; - + case FLOAT: printf("FLOAT: %f\n", sensors_yylval.value); break; - + case NAME: printf("NAME: %s\n", sensors_yylval.name); free(sensors_yylval.name); break; - + case ERROR: printf("ERROR\n"); break; @@ -103,4 +103,3 @@ int main(void) return 0; } - diff --git a/lib/test/test-scanner.pl b/lib/test/test-scanner.pl index 6d163a8e..ca11f044 100755 --- a/lib/test/test-scanner.pl +++ b/lib/test/test-scanner.pl @@ -98,4 +98,3 @@ foreach $scenario (@scenarios) { ok($test->diff_exact(\@stderr, \@experr, \@diff), "stderr: " . $scenario->{"desc"}) or print @diff; } -