Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package procmeter for openSUSE:Factory
checked in at 2022-02-11 23:10:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procmeter (Old)
and /work/SRC/openSUSE:Factory/.procmeter.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procmeter"
Fri Feb 11 23:10:18 2022 rev:24 rq:953776 version:3.6+svn415
Changes:
--------
--- /work/SRC/openSUSE:Factory/procmeter/procmeter.changes 2020-09-07
22:01:07.290048667 +0200
+++ /work/SRC/openSUSE:Factory/.procmeter.new.1956/procmeter.changes
2022-02-11 23:12:20.643455223 +0100
@@ -1,0 +2,17 @@
+Fri Feb 11 00:01:03 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Update to latest svn version 3.6+svn415:
+ + Allow displaying devices that are mounted from tmpfs (refactor
+ code to simplify).
+ + Update version numbers, delete CVS headers from files that have
+ been changed in the last couple of years.
+ + Fix bug with reading ACPI version number string and grammatical
+ error in associated warning message.
+ + Change variable type to avoid crash (something to do with
+ 32-bit / 64-bit incompatibility?).
+ + Change acceptable versions of libsensors library to either v4
+ or v5.
+ + Change parameter type since the original typename no longer
+ seems valid.
+
+-------------------------------------------------------------------
Old:
----
procmeter3-3.6+svn409.tar.xz
New:
----
procmeter3-3.6+svn415.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procmeter.spec ++++++
--- /var/tmp/diff_new_pack.iz1Eb4/_old 2022-02-11 23:12:21.131456634 +0100
+++ /var/tmp/diff_new_pack.iz1Eb4/_new 2022-02-11 23:12:21.135456645 +0100
@@ -1,7 +1,7 @@
#
# spec file for package procmeter
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: procmeter
-Version: 3.6+svn409
+Version: 3.6+svn415
Release: 0
Summary: Utility to display current system parameters
License: GPL-2.0-or-later
++++++ procmeter3-3.6+svn409.tar.xz -> procmeter3-3.6+svn415.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMBar.c
new/procmeter3-3.6+svn415/gtk1/widgets/PMBar.c
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMBar.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMBar.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Bar Widget Source file (for ProcMeter3 3.6).
+ ProcMeter Bar Widget Source file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012 Andrew M. Bishop
+ This file Copyright 1996-2012,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -37,12 +37,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmeterbar_get_type Returns a unique pointer to the Widget type.
+ GtkType gtk_procmeterbar_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmeterbar_get_type(void)
+GtkType gtk_procmeterbar_get_type(void)
{
- static guint pmw_type = 0;
+ static GtkType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMBar.h
new/procmeter3-3.6+svn415/gtk1/widgets/PMBar.h
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMBar.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMBar.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk1/widgets/PMBar.h,v 1.1 2000-12-16
16:38:15 amb Exp $
-
- ProcMeter Bar Widget include file (for ProcMeter3 3.3).
+ ProcMeter Bar Widget include file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,99,2000 Andrew M. Bishop
+ This file Copyright 1996,98,99,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -55,7 +53,7 @@
void (*update)(ProcMeterBar *pmw,gboolean all);
};
-guint gtk_procmeterbar_get_type(void);
+GtkType gtk_procmeterbar_get_type(void);
GtkWidget* gtk_procmeterbar_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMGeneric.c
new/procmeter3-3.6+svn415/gtk1/widgets/PMGeneric.c
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMGeneric.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMGeneric.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk1/widgets/PMGeneric.c,v 1.3 2003-06-21
18:38:56 amb Exp $
-
- ProcMeter Generic Widget Source file (for ProcMeter 3.4a).
+ ProcMeter Generic Widget Source file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000,10,02,03 Andrew M. Bishop
+ This file Copyright 1996,98,2000,10,02,03,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -36,12 +34,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint procmetergeneric_get_type Returns a unique pointer to the Widget type.
+ GtkType procmetergeneric_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetergeneric_get_type(void)
+GtkType gtk_procmetergeneric_get_type(void)
{
- static guint pmw_type=0;
+ static GtkType pmw_type=0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMGeneric.h
new/procmeter3-3.6+svn415/gtk1/widgets/PMGeneric.h
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMGeneric.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMGeneric.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk1/widgets/PMGeneric.h,v 1.1 2000-12-16
16:38:36 amb Exp $
-
- ProcMeter Generic Widget include file (for ProcMeter 3.3).
+ ProcMeter Generic Widget include file (for ProcMeter 36a3).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000 Andrew M. Bishop
+ This file Copyright 1996,98,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -58,7 +56,7 @@
void (*update)(ProcMeterGeneric *pmw);
};
-guint gtk_procmetergeneric_get_type(void);
+GtkType gtk_procmetergeneric_get_type(void);
GtkWidget* gtk_procmetergeneric_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMGraph.c
new/procmeter3-3.6+svn415/gtk1/widgets/PMGraph.c
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMGraph.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMGraph.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk1/widgets/PMGraph.c,v 1.5 2008-04-27
15:21:30 amb Exp $
-
- ProcMeter Graph Widget Source file (for ProcMeter3 3.5b).
+ ProcMeter Graph Widget Source file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2008 Andrew M. Bishop
+ This file Copyright 1996-2008,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -39,12 +37,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmetergraph_get_type Returns a unique pointer to the Widget
type.
+ GtkType gtk_procmetergraph_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetergraph_get_type(void)
+GtkType gtk_procmetergraph_get_type(void)
{
- static guint pmw_type = 0;
+ static GtkType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMGraph.h
new/procmeter3-3.6+svn415/gtk1/widgets/PMGraph.h
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMGraph.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMGraph.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk1/widgets/PMGraph.h,v 1.1 2000-12-16
16:39:02 amb Exp $
-
- ProcMeter Graph Widget include file (for ProcMeter3 3.3).
+ ProcMeter Graph Widget include file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,99,2000 Andrew M. Bishop
+ This file Copyright 1996,98,99,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -60,7 +58,7 @@
void (*update)(ProcMeterGraph *pmw,gboolean all);
};
-guint gtk_procmetergraph_get_type(void);
+GtkType gtk_procmetergraph_get_type(void);
GtkWidget* gtk_procmetergraph_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMText.c
new/procmeter3-3.6+svn415/gtk1/widgets/PMText.c
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMText.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMText.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk1/widgets/PMText.c,v 1.3 2003-06-21
18:39:05 amb Exp $
-
- ProcMeter Text Widget Source file (for ProcMeter 3.4a).
+ ProcMeter Text Widget Source file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000,01,02,03 Andrew M. Bishop
+ This file Copyright 1996,98,2000,01,02,03,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -37,12 +35,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmetertext_get_type Returns a unique pointer to the Widget type.
+ GtkType gtk_procmetertext_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetertext_get_type(void)
+GtkType gtk_procmetertext_get_type(void)
{
- static guint pmw_type = 0;
+ static GtkType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk1/widgets/PMText.h
new/procmeter3-3.6+svn415/gtk1/widgets/PMText.h
--- old/procmeter3-3.6+svn409/gtk1/widgets/PMText.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk1/widgets/PMText.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk1/widgets/PMText.h,v 1.1 2000-12-16
16:39:18 amb Exp $
-
- ProcMeter Text Widget include file (for ProcMeter 3.3).
+ ProcMeter Text Widget include file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000 Andrew M. Bishop
+ This file Copyright 1996,98,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -47,7 +45,7 @@
void (*update)(ProcMeterText *pmw,gboolean all);
};
-guint gtk_procmetertext_get_type(void);
+GtkType gtk_procmetertext_get_type(void);
GtkWidget* gtk_procmetertext_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMBar.c
new/procmeter3-3.6+svn415/gtk2/widgets/PMBar.c
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMBar.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMBar.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Bar Widget Source file (for ProcMeter3 3.6).
+ ProcMeter Bar Widget Source file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012 Andrew M. Bishop
+ This file Copyright 1996-2012,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -37,12 +37,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmeterbar_get_type Returns a unique pointer to the Widget type.
+ GtkType gtk_procmeterbar_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmeterbar_get_type(void)
+GtkType gtk_procmeterbar_get_type(void)
{
- static guint pmw_type = 0;
+ static GtkType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMBar.h
new/procmeter3-3.6+svn415/gtk2/widgets/PMBar.h
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMBar.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMBar.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk2/widgets/PMBar.h,v 1.1 2007-09-19
19:04:34 amb Exp $
-
- ProcMeter Bar Widget include file (for ProcMeter3 3.3).
+ ProcMeter Bar Widget include file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,99,2000 Andrew M. Bishop
+ This file Copyright 1996,98,99,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -55,7 +53,7 @@
void (*update)(ProcMeterBar *pmw,gboolean all);
};
-guint gtk_procmeterbar_get_type(void);
+GtkType gtk_procmeterbar_get_type(void);
GtkWidget* gtk_procmeterbar_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMGeneric.c
new/procmeter3-3.6+svn415/gtk2/widgets/PMGeneric.c
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMGeneric.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMGeneric.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk2/widgets/PMGeneric.c,v 1.2 2007-11-21
19:57:18 amb Exp $
-
- ProcMeter Generic Widget Source file (for ProcMeter 3.5a).
+ ProcMeter Generic Widget Source file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000,10,02,03,07 Andrew M. Bishop
+ This file Copyright 1996,98,2000,10,02,03,07,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -36,12 +34,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint procmetergeneric_get_type Returns a unique pointer to the Widget type.
+ GtkType procmetergeneric_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetergeneric_get_type(void)
+GtkType gtk_procmetergeneric_get_type(void)
{
- static guint pmw_type=0;
+ static GtkType pmw_type=0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMGeneric.h
new/procmeter3-3.6+svn415/gtk2/widgets/PMGeneric.h
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMGeneric.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMGeneric.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk2/widgets/PMGeneric.h,v 1.1 2007-09-19
19:04:59 amb Exp $
-
- ProcMeter Generic Widget include file (for ProcMeter 3.3).
+ ProcMeter Generic Widget include file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000 Andrew M. Bishop
+ This file Copyright 1996,98,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -58,7 +56,7 @@
void (*update)(ProcMeterGeneric *pmw);
};
-guint gtk_procmetergeneric_get_type(void);
+GtkType gtk_procmetergeneric_get_type(void);
GtkWidget* gtk_procmetergeneric_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMGraph.c
new/procmeter3-3.6+svn415/gtk2/widgets/PMGraph.c
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMGraph.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMGraph.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk2/widgets/PMGraph.c,v 1.3 2008-04-27
15:21:30 amb Exp $
-
- ProcMeter Graph Widget Source file (for ProcMeter3 3.5b).
+ ProcMeter Graph Widget Source file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2008 Andrew M. Bishop
+ This file Copyright 1996-2008,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -39,12 +37,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmetergraph_get_type Returns a unique pointer to the Widget
type.
+ GtkType gtk_procmetergraph_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetergraph_get_type(void)
+GtkType gtk_procmetergraph_get_type(void)
{
- static guint pmw_type = 0;
+ static GtkType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMGraph.h
new/procmeter3-3.6+svn415/gtk2/widgets/PMGraph.h
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMGraph.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMGraph.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk2/widgets/PMGraph.h,v 1.1 2007-09-19
19:05:17 amb Exp $
-
- ProcMeter Graph Widget include file (for ProcMeter3 3.3).
+ ProcMeter Graph Widget include file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,99,2000 Andrew M. Bishop
+ This file Copyright 1996,98,99,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -60,7 +58,7 @@
void (*update)(ProcMeterGraph *pmw,gboolean all);
};
-guint gtk_procmetergraph_get_type(void);
+GtkType gtk_procmetergraph_get_type(void);
GtkWidget* gtk_procmetergraph_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMText.c
new/procmeter3-3.6+svn415/gtk2/widgets/PMText.c
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMText.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMText.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk2/widgets/PMText.c,v 1.2 2007-11-21
19:57:18 amb Exp $
-
- ProcMeter Text Widget Source file (for ProcMeter 3.5a).
+ ProcMeter Text Widget Source file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000,01,02,03,07 Andrew M. Bishop
+ This file Copyright 1996,98,2000,01,02,03,07,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -37,12 +35,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmetertext_get_type Returns a unique pointer to the Widget type.
+ GtkType gtk_procmetertext_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetertext_get_type(void)
+GtkType gtk_procmetertext_get_type(void)
{
- static guint pmw_type = 0;
+ static GtkType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk2/widgets/PMText.h
new/procmeter3-3.6+svn415/gtk2/widgets/PMText.h
--- old/procmeter3-3.6+svn409/gtk2/widgets/PMText.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk2/widgets/PMText.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,11 +1,9 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/gtk2/widgets/PMText.h,v 1.1 2007-09-19
19:05:37 amb Exp $
-
- ProcMeter Text Widget include file (for ProcMeter 3.3).
+ ProcMeter Text Widget include file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996,98,2000 Andrew M. Bishop
+ This file Copyright 1996,98,2000,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -47,7 +45,7 @@
void (*update)(ProcMeterText *pmw,gboolean all);
};
-guint gtk_procmetertext_get_type(void);
+GtkType gtk_procmetertext_get_type(void);
GtkWidget* gtk_procmetertext_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMBar.c
new/procmeter3-3.6+svn415/gtk3/widgets/PMBar.c
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMBar.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMBar.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Bar Widget Source file (for ProcMeter3 3.6).
+ ProcMeter Bar Widget Source file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012 Andrew M. Bishop
+ This file Copyright 1996-2012,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -38,12 +38,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmeterbar_get_type Returns a unique pointer to the Widget type.
+ GType gtk_procmeterbar_get_type Returns a unique pointer to the Widget type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmeterbar_get_type(void)
+GType gtk_procmeterbar_get_type(void)
{
- static guint pmw_type = 0;
+ static GType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMBar.h
new/procmeter3-3.6+svn415/gtk3/widgets/PMBar.h
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMBar.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMBar.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Bar Widget include file (for ProcMeter3 3.6).
+ ProcMeter Bar Widget include file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012, 2018 Andrew M. Bishop
+ This file Copyright 1996-2012,2018,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -53,7 +53,7 @@
void (*update)(ProcMeterBar *pmw,gboolean all);
};
-guint gtk_procmeterbar_get_type(void);
+GType gtk_procmeterbar_get_type(void);
GtkWidget* gtk_procmeterbar_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMGeneric.c
new/procmeter3-3.6+svn415/gtk3/widgets/PMGeneric.c
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMGeneric.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMGeneric.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Generic Widget Source file (for ProcMeter 3.6).
+ ProcMeter Generic Widget Source file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012 Andrew M. Bishop
+ This file Copyright 1996-2012,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -35,12 +35,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint procmetergeneric_get_type Returns a unique pointer to the Widget type.
+ GType procmetergeneric_get_type Returns a unique pointer to the Widget type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetergeneric_get_type(void)
+GType gtk_procmetergeneric_get_type(void)
{
- static guint pmw_type=0;
+ static GType pmw_type=0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMGeneric.h
new/procmeter3-3.6+svn415/gtk3/widgets/PMGeneric.h
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMGeneric.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMGeneric.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Generic Widget include file (for ProcMeter 3.6).
+ ProcMeter Generic Widget include file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012, 2018 Andrew M. Bishop
+ This file Copyright 1996-2012,2018,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -53,7 +53,7 @@
void (*update)(ProcMeterGeneric *pmw);
};
-guint gtk_procmetergeneric_get_type(void);
+GType gtk_procmetergeneric_get_type(void);
GtkWidget* gtk_procmetergeneric_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMGraph.c
new/procmeter3-3.6+svn415/gtk3/widgets/PMGraph.c
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMGraph.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMGraph.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Graph Widget Source file (for ProcMeter3 3.6).
+ ProcMeter Graph Widget Source file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012 Andrew M. Bishop
+ This file Copyright 1996-2012,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -38,12 +38,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmetergraph_get_type Returns a unique pointer to the Widget
type.
+ GType gtk_procmetergraph_get_type Returns a unique pointer to the Widget
type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetergraph_get_type(void)
+GType gtk_procmetergraph_get_type(void)
{
- static guint pmw_type = 0;
+ static GType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMGraph.h
new/procmeter3-3.6+svn415/gtk3/widgets/PMGraph.h
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMGraph.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMGraph.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Graph Widget include file (for ProcMeter3 3.6).
+ ProcMeter Graph Widget include file (for ProcMeter3 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012, 2018 Andrew M. Bishop
+ This file Copyright 1996-2012,2018,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -58,7 +58,7 @@
void (*update)(ProcMeterGraph *pmw,gboolean all);
};
-guint gtk_procmetergraph_get_type(void);
+GType gtk_procmetergraph_get_type(void);
GtkWidget* gtk_procmetergraph_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMText.c
new/procmeter3-3.6+svn415/gtk3/widgets/PMText.c
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMText.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMText.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Text Widget Source file (for ProcMeter 3.6).
+ ProcMeter Text Widget Source file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012 Andrew M. Bishop
+ This file Copyright 1996-2012,19 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -36,12 +36,12 @@
/*++++++++++++++++++++++++++++++++++++++
Returns the type of a Widget.
- guint gtk_procmetertext_get_type Returns a unique pointer to the Widget type.
+ GType gtk_procmetertext_get_type Returns a unique pointer to the Widget type.
++++++++++++++++++++++++++++++++++++++*/
-guint gtk_procmetertext_get_type(void)
+GType gtk_procmetertext_get_type(void)
{
- static guint pmw_type = 0;
+ static GType pmw_type = 0;
if(!pmw_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/gtk3/widgets/PMText.h
new/procmeter3-3.6+svn415/gtk3/widgets/PMText.h
--- old/procmeter3-3.6+svn409/gtk3/widgets/PMText.h 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/gtk3/widgets/PMText.h 2019-12-18
20:31:16.000000000 +0100
@@ -1,9 +1,9 @@
/***************************************
- ProcMeter Text Widget include file (for ProcMeter 3.6).
+ ProcMeter Text Widget include file (for ProcMeter 3.6a).
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1996-2012, 2018 Andrew M. Bishop
+ This file Copyright 1996-2012,2018,2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -46,7 +46,7 @@
void (*update)(ProcMeterText *pmw,gboolean all);
};
-guint gtk_procmetertext_get_type(void);
+GType gtk_procmetertext_get_type(void);
GtkWidget* gtk_procmetertext_new(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/acpi.c
new/procmeter3-3.6+svn415/modules/acpi.c
--- old/procmeter3-3.6+svn409/modules/acpi.c 2018-10-14 18:21:05.000000000
+0200
+++ new/procmeter3-3.6+svn415/modules/acpi.c 2019-12-18 20:31:16.000000000
+0100
@@ -1,11 +1,12 @@
/***************************************
- ProcMeter - A system monitoring program for Linux - Version 3.6.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
ACPI source file.
******************/ /******************
Written by Joey Hess.
- This file Copyright 2001-2011, 2018 Joey Hess
+ This file Copyright 2001-2011 Joey Hess
+ Updates Copyright 2018, 2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -106,7 +107,7 @@
fd = open(file, O_RDONLY);
if (fd == -1) return NULL;
end = read(fd, buf, sizeof(buf));
- buf[end-1] = '\0';
+ buf[end < 1023 ? end : 1023] = '\0';
close(fd);
return buf;
}
@@ -297,7 +298,7 @@
}
num = atoi(version);
if (num < ACPI_VERSION) {
- fprintf(stderr, "ProcMeter(%s): ACPI subsystem %s too is old,
consider upgrading to %i.\n",__FILE__,
+ fprintf(stderr, "ProcMeter(%s): ACPI subsystem %s is too old,
consider upgrading to %i.\n",__FILE__,
version, ACPI_VERSION);
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/biff.c
new/procmeter3-3.6+svn415/modules/biff.c
--- old/procmeter3-3.6+svn409/modules/biff.c 2018-10-14 18:21:05.000000000
+0200
+++ new/procmeter3-3.6+svn415/modules/biff.c 2019-12-18 20:31:16.000000000
+0100
@@ -1,5 +1,5 @@
/***************************************
- ProcMeter - A system monitoring program for Linux - Version 3.6.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
Mail inbox monitor.
******************/ /******************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/check-no-libsensors.sh
new/procmeter3-3.6+svn415/modules/check-no-libsensors.sh
--- old/procmeter3-3.6+svn409/modules/check-no-libsensors.sh 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/modules/check-no-libsensors.sh 2019-12-18
20:31:16.000000000 +0100
@@ -5,7 +5,7 @@
cat <<EOF > libsensors-test.c
#include <sensors/sensors.h>
-#if (SENSORS_API_VERSION & 0xf00) != 0x400
+#if ( (SENSORS_API_VERSION & 0xf00) != 0x400 ) && ( (SENSORS_API_VERSION &
0xf00) != 0x500 )
#error
#endif
EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/cpuinfo.c
new/procmeter3-3.6+svn415/modules/cpuinfo.c
--- old/procmeter3-3.6+svn409/modules/cpuinfo.c 2018-10-14 18:21:05.000000000
+0200
+++ new/procmeter3-3.6+svn415/modules/cpuinfo.c 2019-12-18 20:31:16.000000000
+0100
@@ -1,13 +1,11 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/modules/cpuinfo.c,v 1.4 2008-05-05
18:45:17 amb Exp $
-
- ProcMeter - A system monitoring program for Linux - Version 3.5b.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
CPU information.
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1998-2008, 2016 Andrew M. Bishop
+ This file Copyright 1998-2008, 2016, 2017 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/df.c
new/procmeter3-3.6+svn415/modules/df.c
--- old/procmeter3-3.6+svn409/modules/df.c 2018-10-14 18:21:05.000000000
+0200
+++ new/procmeter3-3.6+svn415/modules/df.c 2019-12-18 20:31:16.000000000
+0100
@@ -5,7 +5,7 @@
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1998-2012 Andrew M. Bishop
+ This file Copyright 1998-2012, 2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -75,8 +75,9 @@
static char **disk=NULL;
static int *mounted;
-/* A function to add a disk */
+/* Local functions to validate or add a disk */
static void add_disk(char *dev,char *mnt);
+static int validate_device(char *dev, char *mnt);
/*++++++++++++++++++++++++++++++++++++++
@@ -121,7 +122,7 @@
char device[65],mount[65];
if(sscanf(line,"%64s %64s",device,mount)==2)
- if(strcmp(mount,"none") && *mount=='/' && (*device=='/' ||
strstr(device, ":/")))
+ if(validate_device(device,mount))
add_disk(device,mount);
}
while(fgets_realloc(&line,&length,f));
@@ -147,7 +148,7 @@
continue;
if(sscanf(line,"%64s %64s",device,mount)==2)
- if(strcmp(mount,"none") && *mount=='/' && (*device=='/' ||
strstr(device, ":/")))
+ if(validate_device(device,mount))
add_disk(device,mount);
}
while(fgets_realloc(&line,&length,f));
@@ -192,6 +193,35 @@
/*++++++++++++++++++++++++++++++++++++++
+ Check that a new disk is a validone to use.
+
+ char *dev The name of the device.
+
+ char *mnt The mount point for the device.
+ ++++++++++++++++++++++++++++++++++++++*/
+
+static int validate_device(char *dev, char *mnt)
+{
+ if(!strcmp(mnt,"none")) /* Ignore mountpoints of type "none" (swap
device in /etc/fstab). */
+ return 0;
+
+ if(*mnt!='/') /* Ignore mountpoints that are not anchored at
the root. */
+ return 0;
+
+ if(*dev=='/') /* Accept devices that are real filesystem
objects. */
+ return 1;
+
+ if(strstr(dev, ":/")) /* Accept devices that are NFS filesystems. */
+ return 1;
+
+ if(!strcmp(dev,"tmpfs")) /* Accept devices that use tmpfs filesystem. */
+ return 1;
+
+ return 0;
+}
+
+
+/*++++++++++++++++++++++++++++++++++++++
Add a new disk to the list.
char *dev The name of the device to add.
@@ -268,7 +298,7 @@
char device[65],mount[65];
if(sscanf(line,"%64s %64s",device,mount)==2)
- if(strcmp(mount,"none") && *mount=='/' && (*device=='/' ||
strstr(device, ":/")))
+ if(validate_device(device,mount))
for(i=0;i<ndisks;i++)
if(!strcmp(disk[i],mount))
mounted[i]=1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/libsensors-fan.c
new/procmeter3-3.6+svn415/modules/libsensors-fan.c
--- old/procmeter3-3.6+svn409/modules/libsensors-fan.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/modules/libsensors-fan.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,13 +1,12 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/modules/libsensors-fan.c,v 1.1 2010-02-20
13:33:24 amb Exp $
-
- ProcMeter - A system monitoring program for Linux - Version 3.5c.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
lm_sensors module source file.
******************/ /******************
Written by Mike T. Liang
- This file Copyright 2009, 2010 Mike T. Liang
+ Original file Copyright 2009, 2010 Mike T. Liang
+ Parts of this file Copyright 2019 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
@@ -27,8 +26,8 @@
#include "procmeter.h"
-#if !defined(SENSORS_API_VERSION) || (SENSORS_API_VERSION & 0xf00) != 0x400
-#error "This module requires libsensors version 3"
+#if !defined(SENSORS_API_VERSION) || ( (SENSORS_API_VERSION & 0xf00) != 0x400
) && ( (SENSORS_API_VERSION & 0xf00) != 0x500 )
+#error "This module requires libsensors version 4 or 5"
#else
/* The interface information. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/longrun.c
new/procmeter3-3.6+svn415/modules/longrun.c
--- old/procmeter3-3.6+svn409/modules/longrun.c 2018-10-14 18:21:05.000000000
+0200
+++ new/procmeter3-3.6+svn415/modules/longrun.c 2019-12-18 20:31:16.000000000
+0100
@@ -1,7 +1,5 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/modules/longrun.c,v 1.10 2010-02-28
10:22:16 amb Exp $
-
- ProcMeter - A system monitoring program for Linux - Version 3.5d.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
Transmeta longrun support.
******************/ /******************
@@ -38,7 +36,7 @@
static int cpuid_fd = -1;
-static void read_cpuid(loff_t address, int *eax, int *ebx, int *ecx, int *edx)
{
+static void read_cpuid(off_t address, int *eax, int *ebx, int *ecx, int *edx) {
uint32_t data[4];
if (pread(cpuid_fd, &data, 16, address) != 16) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/sensors.c
new/procmeter3-3.6+svn415/modules/sensors.c
--- old/procmeter3-3.6+svn409/modules/sensors.c 2018-10-14 18:21:05.000000000
+0200
+++ new/procmeter3-3.6+svn415/modules/sensors.c 2019-12-18 20:31:16.000000000
+0100
@@ -1,7 +1,5 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/modules/sensors.c,v 1.11 2010-02-20
13:32:10 amb Exp $
-
- ProcMeter - A system monitoring program for Linux - Version 3.5b.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
Temperature indicators for Mainboard and CPU
Based on loadavg.c, stat-cpu.c by Andrew M. Bishop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/stat-disk.c
new/procmeter3-3.6+svn415/modules/stat-disk.c
--- old/procmeter3-3.6+svn409/modules/stat-disk.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/modules/stat-disk.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,13 +1,11 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/modules/stat-disk.c,v 1.15 2008-12-07
17:35:47 amb Exp $
-
- ProcMeter - A system monitoring program for Linux - Version 3.5c.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
Disk statistics source file.
******************/ /******************
Written by Andrew M. Bishop
- This file Copyright 1998-2008 Andrew M. Bishop
+ This file Copyright 1998-2008, 2018 Andrew M. Bishop
It may be distributed under the GNU Public License, version 2, or
any higher version. See section COPYING of the GNU Public license
for conditions under which this file may be redistributed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/uname.c
new/procmeter3-3.6+svn415/modules/uname.c
--- old/procmeter3-3.6+svn409/modules/uname.c 2018-10-14 18:21:05.000000000
+0200
+++ new/procmeter3-3.6+svn415/modules/uname.c 2019-12-18 20:31:16.000000000
+0100
@@ -1,7 +1,5 @@
/***************************************
- $Header: /home/amb/CVS/procmeter3/modules/uname.c,v 1.5 2002-12-07 19:40:25
amb Exp $
-
- ProcMeter - A system monitoring program for Linux - Version 3.4.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
Uname system information module source file.
******************/ /******************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procmeter3-3.6+svn409/modules/wireless.c
new/procmeter3-3.6+svn415/modules/wireless.c
--- old/procmeter3-3.6+svn409/modules/wireless.c 2018-10-14
18:21:05.000000000 +0200
+++ new/procmeter3-3.6+svn415/modules/wireless.c 2019-12-18
20:31:16.000000000 +0100
@@ -1,5 +1,5 @@
/***************************************
- ProcMeter - A system monitoring program for Linux - Version 3.5b.
+ ProcMeter - A system monitoring program for Linux - Version 3.6a.
Wireless network devices info source file.
******************/ /******************
