[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
whitespace cleanup
|
From: |
Bob Proulx |
|
Subject: |
whitespace cleanup |
|
Date: |
Sun, 15 Oct 2006 22:10:16 -0600 |
|
User-agent: |
Mutt/1.5.9i |
I noticed that the latest sources had a number of whitespace issues.
Dangling whitespace is frequently a source of conflict. I don't think
it should be present in an example put forward as something to
illustrate best practices.
Here is a proposed patch that addresses most of them. This simply ran
nuke-trailing-whitepace on the source files. After performing this
action 'cvs diff -w' (ignore white space when comparing lines) shows
no changes.
2006-10-15 Bob Proulx <address@hidden> (tiny change)
Remove trailing whitespace from files.
Using 'diff -w' afterward shows no changes.
* AUTHORS: Run Emacs function 'nuke-trailing-whitespace' on file.
* ChangeLog.O: Likewise.
* ChangeLog: Likewise.
* Makefile.am: Likewise.
* NEWS: Likewise.
* THANKS: Likewise.
* doc/ChangeLog: Likewise.
* doc/Makefile.am: Likewise.
* doc/hello.texi: Likewise.
* man/ChangeLog: Likewise.
* man/Makefile.am: Likewise.
* po/POTFILES.in: Likewise.
* src/ChangeLog: Likewise.
* src/Makefile.am: Likewise.
* src/hello.c: Likewise.
* tests/greeting-1: Likewise.
* tests/greeting-2: Likewise.
* tests/hello-1: Likewise.
* tests/traditional-1: Likewise.
Index: AUTHORS
===================================================================
RCS file: /sources/hello/hello/AUTHORS,v
retrieving revision 1.4
diff -u -p -u -r1.4 AUTHORS
--- AUTHORS 13 Feb 2006 01:22:31 -0000 1.4
+++ AUTHORS 16 Oct 2006 03:35:36 -0000
@@ -1,7 +1,7 @@
Authors of GNU Hello.
Copyright (C) 1999, 2005, 2006 Free Software Foundation, Inc.
-
+
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
Index: ChangeLog
===================================================================
RCS file: /sources/hello/hello/ChangeLog,v
retrieving revision 1.23
diff -u -p -u -r1.23 ChangeLog
--- ChangeLog 16 Oct 2006 00:03:51 -0000 1.23
+++ ChangeLog 16 Oct 2006 03:35:37 -0000
@@ -1,7 +1,7 @@
2006-10-15 Karl Berry <address@hidden>
* pretest version 2.1.93.
-
+
* tests/*: try to remove \r from the output, so as not to fail on
Windows systems.
@@ -403,7 +403,7 @@
* install-sh: Ditto
* missing: Ditto.
* mkinstalldirs: Ditto.
-
+
1998-12-12 Karl Eichwalder <address@hidden>
* configure.in: (VERSION): 1.3.21.
@@ -443,7 +443,7 @@
* configure.in (ALL_LINGUAS): Add da.
1998-04-05 Karl Eichwalder <address@hidden>
-
+
* configure.in: (VERSION): 1.3.16.
* Makefile.am (ke_PRE): 1.3.15
* use automake 1.2h.
@@ -536,7 +536,7 @@ Wed Jan 8 16:29:06 1997 Karl Eichwalde
Sun Jan 5 10:04:07 1997 Karl Eichwalder <address@hidden>
- * configure.in (VERSION): 1.3.9.
+ * configure.in (VERSION): 1.3.9.
Sat Jan 4 10:23:55 1997 Karl Eichwalder <address@hidden>
@@ -555,7 +555,7 @@ Mon Dec 30 17:21:04 1996 Karl Eichwalde
* configure.in (AC_OUTPUT): Add `tests/Makefile'.
(AC_PROG_MAKE_SET, AC_PROG_INSTALL): Delete.
-
+
* Makefile.am (SUBDIRS): Add `tests'.
* tests/: New directory.
@@ -613,7 +613,7 @@ Wed Dec 4 19:06:42 1996 Karl Eichwalde
@INTLSUB@ and @address@hidden
* configure.in AM_GNU_GETTEXT replaces ud_GNU_GETTEXT.
-
+
* Run `gettextize -f -c' to update all the files from the GNU
gettext library (0.10.25).
@@ -635,7 +635,7 @@ Tue Aug 6 11:58:19 1996 Kjetil Wiekhor
* hello.c: Use ST_BLKSIZE instead of st_blksize. Use the system.h
headerfile.
-
+
Tue Mar 12 09:57:19 1996 Karl Eichwalder <address@hidden>
@@ -651,7 +651,7 @@ Sun Mar 10 13:13:03 1996 Karl Eichwalde
(AC_PREREQ) now 2.8; (AC_PROG_CPP) delete.
* make dist: 1.3.3; internal release.
-
+
* aclocal.m4: ud_LC_MESSAGES, ud_WITH_NLS and ud_GNU_GETTEXT from
gettext-0.10.6.
@@ -681,7 +681,7 @@ Wed Dec 20 09:42:02 1995 Karl Eichwalde
* make dist 1.3-kh.
* configure.in (VERSION): 1.3-kh.
-
+
* THANKS-ke: New file.
Tue Dec 19 13:38:58 1995 Karl Eichwalder <address@hidden>
@@ -694,7 +694,7 @@ Mon Dec 18 16:34:14 1995 Karl Eichwalde
* doc: Move gpl.texinfo, hello.info, hello.texi, and texinfo.tex
to new directory `doc'.
-
+
* src: Move Makefile.in, TAGS, alloca.c, getopt.c, getopt.h,
getopt1.c, hello.c, testdata, and version.c to new directory
`src'.
@@ -702,7 +702,7 @@ Mon Dec 18 16:34:14 1995 Karl Eichwalde
Sat Dec 16 00:00:41 1995 Karl Eichwalder <address@hidden>
* texinfo.tex: Include version 2.150.
-
+
* Makefile.in (install): Use install-info if available.
(clean): Add `*~ and `\#*'.
(configure, config.h, stamp-h, config.h.in, stamp-h.in): New
Index: ChangeLog.O
===================================================================
RCS file: /sources/hello/hello/ChangeLog.O,v
retrieving revision 1.1
diff -u -p -u -r1.1 ChangeLog.O
--- ChangeLog.O 6 Dec 2004 00:24:10 -0000 1.1
+++ ChangeLog.O 16 Oct 2006 03:35:37 -0000
@@ -82,7 +82,7 @@ Wed Sep 16 19:30:08 1992 The King (elv
Wed Sep 2 23:45:10 1992 Noah Friedman (address@hidden)
- * hello.c (main): added zork output compatibility.
+ * hello.c (main): added zork output compatibility.
Wed Sep 2 22:58:15 1992 The King (address@hidden)
Index: Makefile.am
===================================================================
RCS file: /sources/hello/hello/Makefile.am,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile.am
--- Makefile.am 23 Aug 2006 15:41:08 -0000 1.9
+++ Makefile.am 16 Oct 2006 03:35:37 -0000
@@ -1,6 +1,6 @@
# Process this file with automake to produce Makefile.in (in this,
# and all subdirectories).
-#
+#
# Makefile for the top-level directory of GNU hello.
# Copyright (C) 1997, 1998, 2005, 2006 Free Software Foundation, Inc.
#
@@ -30,7 +30,7 @@ SUBDIRS = contrib gnulib/lib po src doc
# `make diff' produces a diff against the previous version, given both
# .tar.gz's in the current directory. This should only be done when an
# official release is made (and only if you care to provide diffs).
-#
+#
hello_pre = 2.1.1
#
diff: diffcheck
Index: NEWS
===================================================================
RCS file: /sources/hello/hello/NEWS,v
retrieving revision 1.9
diff -u -p -u -r1.9 NEWS
--- NEWS 15 Oct 2006 21:06:12 -0000 1.9
+++ NEWS 16 Oct 2006 03:35:37 -0000
@@ -2,7 +2,7 @@ This NEWS file records noteworthy change
See the manual for detailed information.
Copyright (C) 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+ 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
Index: THANKS
===================================================================
RCS file: /sources/hello/hello/THANKS,v
retrieving revision 1.3
diff -u -p -u -r1.3 THANKS
--- THANKS 28 Mar 2005 00:40:42 -0000 1.3
+++ THANKS 16 Oct 2006 03:35:37 -0000
@@ -1,7 +1,7 @@
Additional contributors to GNU Hello.
-
+
Copyright (C) 1999, 2005 Free Software Foundation, Inc.
-
+
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
Index: doc/ChangeLog
===================================================================
RCS file: /sources/hello/hello/doc/ChangeLog,v
retrieving revision 1.3
diff -u -p -u -r1.3 ChangeLog
--- doc/ChangeLog 16 Jul 2006 00:01:23 -0000 1.3
+++ doc/ChangeLog 16 Oct 2006 03:35:37 -0000
@@ -96,4 +96,3 @@ Tue Dec 19 08:26:09 1995 Karl Eichwalde
* Makefile.in, version.texi: New file.
doc/ChangeLog ends here
-
Index: doc/Makefile.am
===================================================================
RCS file: /sources/hello/hello/doc/Makefile.am,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.am
--- doc/Makefile.am 14 May 2005 23:47:49 -0000 1.3
+++ doc/Makefile.am 16 Oct 2006 03:35:37 -0000
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in.
## Makefile.am for hello/doc.
-##
+##
## Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
Index: doc/hello.texi
===================================================================
RCS file: /sources/hello/hello/doc/hello.texi,v
retrieving revision 1.7
diff -u -p -u -r1.7 hello.texi
--- doc/hello.texi 24 Aug 2006 12:40:27 -0000 1.7
+++ doc/hello.texi 16 Oct 2006 03:35:37 -0000
@@ -253,7 +253,7 @@ characters or other fancy stuff, using t
@opindex -t
@cindex traditional
@cindex modern
-Use the traditional greeting message @samp{hello, world} rather
+Use the traditional greeting message @samp{hello, world} rather
than the more modern @samp{Hello, world!}.
@item --version
Index: man/ChangeLog
===================================================================
RCS file: /sources/hello/hello/man/ChangeLog,v
retrieving revision 1.4
diff -u -p -u -r1.4 ChangeLog
--- man/ChangeLog 3 Sep 2006 00:09:44 -0000 1.4
+++ man/ChangeLog 16 Oct 2006 03:35:37 -0000
@@ -50,7 +50,7 @@
(noinst_SCRIPTS): Ditto, add $(HELP2MAN).
(EXTRA_DIST): Ditto, add $(man_MANS) $(noinst_SCRIPTS).
(hello.1): New target.
-
+
1999-08-21 Karl Eichwalder <address@hidden>
* help2man: Add this file from the textutils package.
Index: man/Makefile.am
===================================================================
RCS file: /sources/hello/hello/man/Makefile.am,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile.am
--- man/Makefile.am 3 Sep 2006 00:09:44 -0000 1.8
+++ man/Makefile.am 16 Oct 2006 03:35:37 -0000
@@ -1,6 +1,6 @@
# Process this file with automake to produce Makefile.in
# Makefile.am for hello/man.
-#
+#
# Copyright (C) 1996, 1997, 2005, 2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
Index: po/POTFILES.in
===================================================================
RCS file: /sources/hello/hello/po/POTFILES.in,v
retrieving revision 1.4
diff -u -p -u -r1.4 POTFILES.in
--- po/POTFILES.in 17 Aug 2006 00:06:51 -0000 1.4
+++ po/POTFILES.in 16 Oct 2006 03:35:37 -0000
@@ -1,9 +1,9 @@
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-#
+#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved.
-#
+#
# List of source files containing translatable strings.
# Package source files.
Index: src/ChangeLog
===================================================================
RCS file: /sources/hello/hello/src/ChangeLog,v
retrieving revision 1.10
diff -u -p -u -r1.10 ChangeLog
--- src/ChangeLog 29 Aug 2006 22:46:04 -0000 1.10
+++ src/ChangeLog 16 Oct 2006 03:35:37 -0000
@@ -21,12 +21,12 @@
(main): Convert to ANSI C definition.
2006-08-20 Karl Berry <address@hidden>
-
+
* hello.c (main): try a new style for the --version output.
-
+
* hello.c (main): do not exit(0) prematurely with --help or
--version, we need to go through close_stdout.
-
+
2006-07-16 Karl Berry <address@hidden>
* system.h: #include "closeout.h".
@@ -48,7 +48,7 @@
* Makefile.am (noinst_HEADERS): remove, gettext.h comes from gnulib.
(hello_LDADD): remove @address@hidden
* hello.c: remove mail reading stuff, and hence alloca stuff.
-
+
* getopt*.c, gettext.h: remove these files, they come from gnulib.
2005-08-19 Karl Berry <address@hidden>
@@ -166,7 +166,7 @@ Sun Jan 19 12:10:46 1997 Karl Eichwalde
most recent year in which changes were made (according to the
Coding Standards).
Don't start error messages with capital letters.
-
+
Thu Jan 9 17:56:06 1997 Karl Eichwalder <address@hidden>
* hello.c (main): Correct the address for reporting bugs.
@@ -228,7 +228,7 @@ Mon Dec 16 21:10:36 1996 Karl Eichwalde
Thu Dec 5 16:15:56 1996 Karl Eichwalder <address@hidden>
* hello.c: include <config.h> if HAVE_CONFIG_H and <locale.h> if
- HAVE_LOCALE_H.
+ HAVE_LOCALE_H.
(main): adjust --help tableau.
(main): Change --version output to what is required by
GNU standards.
@@ -241,7 +241,7 @@ Thu Dec 5 16:15:56 1996 Karl Eichwalde
(bin_PROGRAMS, noinst_HEADERS, hello_SOURCES, EXTRA_DIST, datadir,
localedir, INCLUDES, DEFS, LDADD): set.
($(bin_PROGRAMS)): new target.
-
+
Mon Dec 2 19:55:02 1996 Karl Eichwalder <address@hidden>
* Makefile.in (HDRS): add system.h.
Index: src/Makefile.am
===================================================================
RCS file: /sources/hello/hello/src/Makefile.am,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile.am
--- src/Makefile.am 16 Jul 2006 16:17:59 -0000 1.8
+++ src/Makefile.am 16 Oct 2006 03:35:37 -0000
@@ -18,7 +18,7 @@
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
bin_PROGRAMS = hello
-hello_SOURCES = hello.c system.h
+hello_SOURCES = hello.c system.h
hello_LDADD = @LIBINTL@ ../gnulib/lib/libgnu.a
Index: src/hello.c
===================================================================
RCS file: /sources/hello/hello/src/hello.c,v
retrieving revision 1.19
diff -u -p -u -r1.19 hello.c
--- src/hello.c 29 Aug 2006 22:45:22 -0000 1.19
+++ src/hello.c 16 Oct 2006 03:35:37 -0000
@@ -22,7 +22,7 @@
/* String containing name the program is called with. */
const char *program_name;
-
+
static const struct option longopts[] =
{
{ "greeting", required_argument, NULL, 'g' },
@@ -76,13 +76,13 @@ main (int argc, char *argv[])
lose = 1;
break;
}
-
+
if (lose || optind < argc)
{
/* Print error message and exit. */
if (optind < argc)
fputs (_("Too many arguments\n"), stderr);
- fprintf (stderr, _("Try `%s --help' for more information.\n"),
+ fprintf (stderr, _("Try `%s --help' for more information.\n"),
program_name);
exit (1);
}
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
/* Print help info and exit. This long message is split into
several pieces to help translators be able to align different
blocks and identify the various pieces. */
-
+
/* TRANSLATORS: --help output 1
no-wrap */
fputs (_("\
@@ -121,7 +121,7 @@ Usage: %s [OPTION]...\n"), program_name)
printf ("\n");
/* TRANSLATORS: --help output 5 (end)
- TRANSLATORS: the placeholder indicates the bug-reporting address
+ TRANSLATORS: the placeholder indicates the bug-reporting address
for this application. Please add _another line_ with the
address for translation bugs.
no-wrap */
@@ -170,7 +170,7 @@ This is free software. There is NO WARR
/* Exit unsuccessfully if the write failed. (This is implemented in
the Gnulib module "closeout". */
close_stdout ();
-
+
/* Otherwise, exit successfully. */
exit (0);
}
Index: tests/greeting-1
===================================================================
RCS file: /sources/hello/hello/tests/greeting-1,v
retrieving revision 1.6
diff -u -p -u -r1.6 greeting-1
--- tests/greeting-1 16 Oct 2006 00:03:51 -0000 1.6
+++ tests/greeting-1 16 Oct 2006 03:35:37 -0000
@@ -1,7 +1,7 @@
#! /bin/sh
# Test arbitrary --greeting.
-#
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
Index: tests/greeting-2
===================================================================
RCS file: /sources/hello/hello/tests/greeting-2,v
retrieving revision 1.2
diff -u -p -u -r1.2 greeting-2
--- tests/greeting-2 16 Oct 2006 00:03:51 -0000 1.2
+++ tests/greeting-2 16 Oct 2006 03:35:37 -0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Test very long --greeting argument, and also show skipping a test.
# (And one way to compute full moons.)
-#
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
Index: tests/hello-1
===================================================================
RCS file: /sources/hello/hello/tests/hello-1,v
retrieving revision 1.6
diff -u -p -u -r1.6 hello-1
--- tests/hello-1 16 Oct 2006 00:03:51 -0000 1.6
+++ tests/hello-1 16 Oct 2006 03:35:37 -0000
@@ -1,7 +1,7 @@
#! /bin/sh
# Test standard GNU greeting.
-#
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
Index: tests/traditional-1
===================================================================
RCS file: /sources/hello/hello/tests/traditional-1,v
retrieving revision 1.5
diff -u -p -u -r1.5 traditional-1
--- tests/traditional-1 16 Oct 2006 00:03:51 -0000 1.5
+++ tests/traditional-1 16 Oct 2006 03:35:37 -0000
@@ -1,7 +1,7 @@
#! /bin/sh
# Test traditional greeting.
-#
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
- whitespace cleanup,
Bob Proulx <=