From b1e74b06c7b3ade098d4d38061f65c76e8986624 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Thu, 20 Oct 2016 10:17:40 -0400 Subject: [PATCH] wmcpuload: Restore some previous commits (COPYING update, whitespace). --- wmcpuload/COPYING | 41 +++++++++++++++++++------------------- wmcpuload/ChangeLog | 2 +- wmcpuload/doc/wmcpuload.1 | 2 +- wmcpuload/src/cpu_irix.c | 6 +++--- wmcpuload/src/cpu_netbsd.c | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/wmcpuload/COPYING b/wmcpuload/COPYING index d60c31a..d159169 100644 --- a/wmcpuload/COPYING +++ b/wmcpuload/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. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ 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 @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -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 - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + 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 @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/wmcpuload/ChangeLog b/wmcpuload/ChangeLog index 7dd050f..1a7467f 100644 --- a/wmcpuload/ChangeLog +++ b/wmcpuload/ChangeLog @@ -219,7 +219,7 @@ $Id: ChangeLog,v 1.9 2006-01-28 10:40:06 sch Exp $ 2001 July 23 * version 0.5.6 released - * changed to get rid of compiler warning messages with gcc + * changed to get rid of compiler warning messages with gcc on Linux and FreeBSD. * added OpenBSD support (it's testing!!) (john katagawa ) diff --git a/wmcpuload/doc/wmcpuload.1 b/wmcpuload/doc/wmcpuload.1 index 5b7d87d..8647e69 100644 --- a/wmcpuload/doc/wmcpuload.1 +++ b/wmcpuload/doc/wmcpuload.1 @@ -27,7 +27,7 @@ command. This manual page was written for the Debian GNU/Linux distribution. .PP .\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, +.\" \fI\fP escape sequences to invode bold face and italics, .\" respectively. \fBWMCPULoad\fP is a dockapp that is supported by X window managers such as Window Maker, AfterStep, BlackBox, and Enlightenment. It displays the current diff --git a/wmcpuload/src/cpu_irix.c b/wmcpuload/src/cpu_irix.c index 8521781..68a8fa0 100644 --- a/wmcpuload/src/cpu_irix.c +++ b/wmcpuload/src/cpu_irix.c @@ -44,7 +44,7 @@ cpu_get_usage(cpu_options *opts) int result, i; if (opts->cpu_number >= cpuCount) return 0; - SGT_COOKIE_INIT(&cookie); + SGT_COOKIE_INIT(&cookie); if (opts->cpu_number < 1) { /* Get stats for all CPUs */ cpuload = 0; @@ -57,7 +57,7 @@ cpu_get_usage(cpu_options *opts) cpuload += info.cpu[CPU_USER] + info.cpu[CPU_KERNEL] + info.cpu[CPU_WAIT] + info.cpu[CPU_SXBRK] + info.cpu[CPU_INTR]; - cputotal += cpuload + info.cpu[CPU_IDLE]; + cputotal += cpuload + info.cpu[CPU_IDLE]; }; } else { SGT_COOKIE_SET_CPU(&cookie, opts->cpu_number); @@ -67,7 +67,7 @@ cpu_get_usage(cpu_options *opts) cpuload = info.cpu[CPU_USER] + info.cpu[CPU_KERNEL] + info.cpu[CPU_WAIT] + info.cpu[CPU_SXBRK] + info.cpu[CPU_INTR]; - cputotal = cpuload + info.cpu[CPU_IDLE]; + cputotal = cpuload + info.cpu[CPU_IDLE]; } #ifdef DEBUG fprintf(stderr, "!!!%d/%d: %d, %d, %d, %d, %d, %d\n", opts->cpu_number, diff --git a/wmcpuload/src/cpu_netbsd.c b/wmcpuload/src/cpu_netbsd.c index 119d58a..9b85aef 100644 --- a/wmcpuload/src/cpu_netbsd.c +++ b/wmcpuload/src/cpu_netbsd.c @@ -1,7 +1,7 @@ /* $Id: cpu_netbsd.c,v 1.3 2003-10-13 04:34:02 sch Exp $ */ /* - * cpu_netbsd - module to get cpu usage, for NetBSD + * cpu_netbsd - module to get cpu usage, for NetBSD * * This code is based on cpu_openbsd.c *