summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Youngman <jay@gnu.org>2014-07-19 11:17:52 +0100
committerJames Youngman <jay@gnu.org>2014-07-19 11:17:52 +0100
commitd5234fe96a9551c94f2ad2e5cd928cfd56757e05 (patch)
tree2686d682a4e1f7d2011b8b2f8b6c314986cd9142
parent82e2f2c6fc93c4142dbd4a07d50c481a189680f3 (diff)
downloadfindutils-d5234fe96a9551c94f2ad2e5cd928cfd56757e05.tar.gz
Standardize on "initialize".
* find/exec.c (initialise_wd_for_exec): rename to initialize_wd_for_exec, since "initialize" is the preferred form even in UK spelling (the OED says "initialise" is a variant). Update callers (it's a static function). Update spelling in comments. * find/find.c (main): Fix missing "to" in error message and update "initialise" to "initialize". Update comment too. * find/ftsfind.c (main): Update spelling in error message. * lib/listfile.c (print_name_with_quoting): spelling change in comment. * find/tree.c (init_pred_perf): Likewise. * lib/extendbuf.c (extendbuf): Likewise. * lib/splitstring.h: Likewise. * find/print.c (format_date): Likewise. * doc/find-maint.texi (Tools): Update spelling.
-rw-r--r--ChangeLog17
-rw-r--r--doc/find-maint.texi2
-rw-r--r--find/exec.c8
-rw-r--r--find/find.c4
-rw-r--r--find/ftsfind.c2
-rw-r--r--find/parser.c2
-rw-r--r--find/print.c2
-rw-r--r--find/tree.c2
-rw-r--r--lib/extendbuf.c2
-rw-r--r--lib/listfile.c2
-rw-r--r--lib/splitstring.h2
11 files changed, 31 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f7f7438..000b64a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2014-07-19 James Youngman <jay@gnu.org>
+ Standardize on "initialize".
+ * find/exec.c (initialise_wd_for_exec): rename to
+ initialize_wd_for_exec, since "initialize" is the preferred form
+ even in UK spelling (the OED says "initialise" is a variant).
+ Update callers (it's a static function). Update spelling in
+ comments.
+ * find/find.c (main): Fix missing "to" in error message and update
+ "initialise" to "initialize". Update comment too.
+ * find/ftsfind.c (main): Update spelling in error message.
+ * lib/listfile.c (print_name_with_quoting): spelling change in
+ comment.
+ * find/tree.c (init_pred_perf): Likewise.
+ * lib/extendbuf.c (extendbuf): Likewise.
+ * lib/splitstring.h: Likewise.
+ * find/print.c (format_date): Likewise.
+ * doc/find-maint.texi (Tools): Update spelling.
+
Bug #42793: mention the bugfix in NEWS.
* NEWS: mention the bugfix.
diff --git a/doc/find-maint.texi b/doc/find-maint.texi
index d891549f..8b14fd4d 100644
--- a/doc/find-maint.texi
+++ b/doc/find-maint.texi
@@ -471,7 +471,7 @@ information we can work to remove unnecessary file system operations.
Valgrind is a tool which dynamically verifies the memory accesses a
program makes to ensure that they are valid (for example, that the
behaviour of the program does not in any way depend on the contents of
-uninitialised memory).
+uninitialized memory).
@item DejaGnu
DejaGnu is the test framework used to run the findutils test suite
diff --git a/find/exec.c b/find/exec.c
index 97bb4a24..06394f16 100644
--- a/find/exec.c
+++ b/find/exec.c
@@ -55,13 +55,13 @@
#endif
-/* Initialise exec->wd_for_exec.
+/* Initialize exec->wd_for_exec.
We save in exec->wd_for_exec the directory whose path relative to
cwd_df is dir.
*/
static bool
-initialise_wd_for_exec (struct exec_val *execp, int cwd_fd, const char *dir)
+initialize_wd_for_exec (struct exec_val *execp, int cwd_fd, const char *dir)
{
execp->wd_for_exec = xmalloc (sizeof (*execp->wd_for_exec));
execp->wd_for_exec->name = NULL;
@@ -95,13 +95,13 @@ record_exec_dir (struct exec_val *execp)
if (strchr (state.rel_pathname, '/'))
{
char *dir = mdir_name (state.rel_pathname);
- bool result = initialise_wd_for_exec (execp, state.cwd_dir_fd, dir);
+ bool result = initialize_wd_for_exec (execp, state.cwd_dir_fd, dir);
free (dir);
return result;
}
else
{
- return initialise_wd_for_exec (execp, state.cwd_dir_fd, ".");
+ return initialize_wd_for_exec (execp, state.cwd_dir_fd, ".");
}
}
return true;
diff --git a/find/find.c b/find/find.c
index 0dd4db1a..a8c6b4f1 100644
--- a/find/find.c
+++ b/find/find.c
@@ -200,7 +200,7 @@ main (int argc, char **argv)
if (NULL == state.shared_files)
{
error (EXIT_FAILURE, errno,
- _("Failed initialise shared-file hash table"));
+ _("Failed to initialize shared-file hash table"));
}
/* Set the option defaults before we do the locale
@@ -229,7 +229,7 @@ main (int argc, char **argv)
fprintf (stderr, "cur_day_start = %s", ctime (&options.cur_day_start));
#endif /* DEBUG */
- /* state.cwd_dir_fd has to be initialised before we call build_expression_tree ()
+ /* state.cwd_dir_fd has to be initialized before we call build_expression_tree ()
* because command-line parsing may lead us to stat some files.
*/
state.cwd_dir_fd = AT_FDCWD;
diff --git a/find/ftsfind.c b/find/ftsfind.c
index 483c4b5d..1cdf44c4 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
@@ -674,7 +674,7 @@ main (int argc, char **argv)
if (NULL == state.shared_files)
{
error (EXIT_FAILURE, errno,
- _("Failed initialise shared-file hash table"));
+ _("Failed initialize shared-file hash table"));
}
/* Set the option defaults before we do the locale initialisation as
diff --git a/find/parser.c b/find/parser.c
index 01d10508..dc6c47c6 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -2311,7 +2311,7 @@ parse_samefile (const struct parser_table* entry, char **argv, int *arg_ptr)
* the file open if we can. This would prevent the system reusing
* the file.
*/
- fd = -3; /* means, uninitialised */
+ fd = -3; /* -3 means uninitialized */
openflags = O_RDONLY;
if (options.symlink_handling == SYMLINK_NEVER_DEREF)
diff --git a/find/print.c b/find/print.c
index ae1b8c3c..90b62ffc 100644
--- a/find/print.c
+++ b/find/print.c
@@ -604,7 +604,7 @@ format_date (struct timespec ts, int kind)
* runtime and examining files on an msdos filesytem. So for that
* reason we set NS_BUF_LEN to 32, which is simply "long enough" as
* opposed to "exactly the right size". Note that the behaviour of
- * NetBSD appears to be a result of the use of uninitialised data,
+ * NetBSD appears to be a result of the use of uninitialized data,
* as it's not 100% reproducible (more like 25%).
*/
enum {
diff --git a/find/tree.c b/find/tree.c
index 7502fd5e..026dead7 100644
--- a/find/tree.c
+++ b/find/tree.c
@@ -1452,7 +1452,7 @@ build_expression_tree (int argc, char *argv[], int end_of_leading_options)
return eval_tree;
}
-/* Initialise the performance data for a predicate.
+/* Initialize the performance data for a predicate.
*/
static void
init_pred_perf (struct predicate *pred)
diff --git a/lib/extendbuf.c b/lib/extendbuf.c
index f9ece71a..e6e91035 100644
--- a/lib/extendbuf.c
+++ b/lib/extendbuf.c
@@ -64,7 +64,7 @@ extendbuf (void* existing, size_t wanted, size_t *allocated)
{
int saved_errno;
size_t newsize;
- void *result; /* leave uninitialised to allow static code checkers to identify bugs */
+ void *result; /* leave uninitialized to allow static code checkers to identify bugs */
saved_errno = errno;
diff --git a/lib/listfile.c b/lib/listfile.c
index e60cbbe8..8e7bd61a 100644
--- a/lib/listfile.c
+++ b/lib/listfile.c
@@ -393,7 +393,7 @@ print_name_with_quoting (register const char *p, FILE *stream)
{
if (EOF == putc (c, stream))
return false;
- fprintf_result = 1; /* otherwise it's used uninitialised. */
+ fprintf_result = 1; /* otherwise it's used uninitialized. */
}
else
{
diff --git a/lib/splitstring.h b/lib/splitstring.h
index c91f7e75..d977573d 100644
--- a/lib/splitstring.h
+++ b/lib/splitstring.h
@@ -25,7 +25,7 @@
* has length *LEN.
*
* Set FIRST to true only on the first call for any given value of s.
- * *POS and *LEN do not need to be initialised in this case.
+ * *POS and *LEN do not need to be initialized in this case.
* On subsequent calls, these values should be left at the values
* set by the last call.
*