From 5f168bf8465ae50ba5c2c761b52f29a0500c0658 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 17 Apr 2006 01:30:21 +0000 Subject: [PATCH] GNU standards require "file name" instead of "filename" in documentation. It's nice for our code to follow the convention too. --- src/data/ChangeLog | 13 +++++++++++++ src/data/any-reader.c | 2 +- src/data/any-writer.c | 2 +- src/data/automake.mk | 4 ++-- src/data/file-handle-def.c | 2 +- src/data/{filename.c => file-name.c} | 2 +- src/data/{filename.h => file-name.h} | 6 +++--- src/data/make-file.c | 2 +- src/data/sys-file-reader.c | 2 +- src/language/data-io/data-reader.c | 2 +- src/language/data-io/data-writer.c | 2 +- src/language/data-io/file-handle.q | 2 +- src/language/line-buffer.c | 2 +- src/message.c | 2 +- src/output/ascii.c | 2 +- src/output/html.c | 2 +- src/output/htmlP.h | 2 +- src/output/output.c | 2 +- src/output/postscript.c | 2 +- src/ui/terminal/command-line.c | 2 +- src/ui/terminal/main.c | 2 +- src/ui/terminal/read-line.c | 4 ++-- 22 files changed, 38 insertions(+), 25 deletions(-) rename src/data/{filename.c => file-name.c} (99%) rename src/data/{filename.h => file-name.h} (97%) diff --git a/src/data/ChangeLog b/src/data/ChangeLog index c453f1788e..53067496b3 100644 --- a/src/data/ChangeLog +++ b/src/data/ChangeLog @@ -1,3 +1,16 @@ +Sun Apr 16 18:28:35 2006 Ben Pfaff + + GNU standards require "file name" instead of "filename" in + documentation. It's nice for our code to follow the convention + too. + + * filename.c: Rename to file-name.c. + + * filename.h: Rename to file-name.h. Update all inclusions. + Update header guards. + + * automake.mk: Update file names. + Sun Apr 16 16:42:47 2006 Ben Pfaff * filename.c: (fn_dirname) Renamed fn_dir_name(), all references diff --git a/src/data/any-reader.c b/src/data/any-reader.c index df37c8ea47..0156d0b5cf 100644 --- a/src/data/any-reader.c +++ b/src/data/any-reader.c @@ -26,7 +26,7 @@ #include #include #include "file-handle-def.h" -#include "filename.h" +#include "file-name.h" #include "por-file-reader.h" #include "sys-file-reader.h" #include diff --git a/src/data/any-writer.c b/src/data/any-writer.c index 9ee8af917e..2aeaa3a5d1 100644 --- a/src/data/any-writer.c +++ b/src/data/any-writer.c @@ -26,7 +26,7 @@ #include #include #include "file-handle-def.h" -#include "filename.h" +#include "file-name.h" #include "por-file-writer.h" #include "sys-file-writer.h" #include diff --git a/src/data/automake.mk b/src/data/automake.mk index 95507c82eb..86fcade1e5 100644 --- a/src/data/automake.mk +++ b/src/data/automake.mk @@ -23,8 +23,8 @@ src_data_libdata_a_SOURCES = \ src/data/dictionary.h \ src/data/file-handle-def.c \ src/data/file-handle-def.h \ - src/data/filename.c \ - src/data/filename.h \ + src/data/file-name.c \ + src/data/file-name.h \ src/data/format.c \ src/data/format.h \ src/data/format.def \ diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c index 66ee25f5f8..152e5d4bed 100644 --- a/src/data/file-handle-def.c +++ b/src/data/file-handle-def.c @@ -25,7 +25,7 @@ #include #include #include -#include "filename.h" +#include "file-name.h" #include #include #include "variable.h" diff --git a/src/data/filename.c b/src/data/file-name.c similarity index 99% rename from src/data/filename.c rename to src/data/file-name.c index 2a0dd947bc..a88f83cf4d 100644 --- a/src/data/filename.c +++ b/src/data/file-name.c @@ -19,7 +19,7 @@ #include #include -#include "filename.h" +#include "file-name.h" #include #include #include diff --git a/src/data/filename.h b/src/data/file-name.h similarity index 97% rename from src/data/filename.h rename to src/data/file-name.h index 89b8aca42a..f9620b035d 100644 --- a/src/data/filename.h +++ b/src/data/file-name.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if !filename_h -#define filename_h 1 +#ifndef FILE_NAME_H +#define FILE_NAME_H 1 #include @@ -68,4 +68,4 @@ void fn_free_identity (struct file_identity *); int fn_compare_file_identities (const struct file_identity *, const struct file_identity *); -#endif /* filename_h */ +#endif /* file-name.h */ diff --git a/src/data/make-file.c b/src/data/make-file.c index 1d32d07e39..5f5a224a2d 100644 --- a/src/data/make-file.c +++ b/src/data/make-file.c @@ -23,7 +23,7 @@ #include #include #include -#include "filename.h" +#include "file-name.h" #include "make-file.h" #include #include diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c index 58a885ae4a..d5fe5c7ca7 100644 --- a/src/data/sys-file-reader.c +++ b/src/data/sys-file-reader.c @@ -36,7 +36,7 @@ #include "case.h" #include "dictionary.h" #include "file-handle-def.h" -#include "filename.h" +#include "file-name.h" #include "format.h" #include "value-labels.h" #include "variable.h" diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c index 8d9dd2074d..22e15f973c 100644 --- a/src/language/data-io/data-reader.c +++ b/src/language/data-io/data-reader.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/language/data-io/data-writer.c b/src/language/data-io/data-writer.c index eb5fe01963..9aba2aaf82 100644 --- a/src/language/data-io/data-writer.c +++ b/src/language/data-io/data-writer.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "gettext.h" diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q index 09c180dc84..e44afbc73a 100644 --- a/src/language/data-io/file-handle.q +++ b/src/language/data-io/file-handle.q @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/language/line-buffer.c b/src/language/line-buffer.c index 53a63279a5..f5a8b30d89 100644 --- a/src/language/line-buffer.c +++ b/src/language/line-buffer.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/message.c b/src/message.c index c48b08e8b1..6985b261f1 100644 --- a/src/message.c +++ b/src/message.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/output/ascii.c b/src/output/ascii.c index bafe74acce..53610bdec1 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/output/html.c b/src/output/html.c index 3557085f39..fd25285ad3 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "error.h" #include "getline.h" #include "getlogin_r.h" diff --git a/src/output/htmlP.h b/src/output/htmlP.h index fe63843d90..1a29caeb8c 100644 --- a/src/output/htmlP.h +++ b/src/output/htmlP.h @@ -20,7 +20,7 @@ #if !htmlP_h #define htmlP_h 1 -#include +#include /* HTML output driver extension record. */ struct html_driver_ext diff --git a/src/output/output.c b/src/output/output.c index 349b5d3c32..d590a38e14 100644 --- a/src/output/output.c +++ b/src/output/output.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "htmlP.h" #include "intprops.h" #include diff --git a/src/output/postscript.c b/src/output/postscript.c index 7554dba578..7fea637426 100644 --- a/src/output/postscript.c +++ b/src/output/postscript.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include "afm.h" #include "chart.h" diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c index cf5b660c93..2a1fa41cda 100644 --- a/src/ui/terminal/command-line.c +++ b/src/ui/terminal/command-line.c @@ -33,7 +33,7 @@ #include #include "read-line.h" #include -#include +#include #include #include diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 69a7b12bc2..746fb16077 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c index 7122b78d87..1a71d77a59 100644 --- a/src/ui/terminal/read-line.c +++ b/src/ui/terminal/read-line.c @@ -26,12 +26,12 @@ #include "read-line.h" #include -#include +#include #include #include #include #include -#include +#include #include #include "gettext.h" -- 2.30.2