This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26.9000-1023-g5069ff3
- From: carlos at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Dec 2017 03:28:45 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-1023-g5069ff3
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5069ff32842c60c55f8b573ee66fe43f9ec364af (commit)
from c85e54ac6cef0faed7b7ffc722f52523dec59bf5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5069ff32842c60c55f8b573ee66fe43f9ec364af
commit 5069ff32842c60c55f8b573ee66fe43f9ec364af
Author: Arnold Robbins <arnold@skeeve.com>
Date: Tue Dec 19 19:26:08 2017 -0800
regex: Fix spelling in comments.
Fix the spelling in various comments throughout the
regex implementation. These changes are also present
in gnulib and will be integrated there also, see:
https://sourceware.org/ml/libc-alpha/2017-12/msg00688.html
diff --git a/ChangeLog b/ChangeLog
index bb26212..982798c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-12-19 Arnold D. Robbins <arnold@skeeve.com>
+
+ * posix/regcomp.c: Fix spelling in comments.
+ * posix/regex.h: Likewise.
+ * posix/regex_internal.c: Likewise.
+ * posix/regexec.c: Likewise.
+
2017-12-19 Gabriel F. T. Gomes <gabriel@inconstante.eti.br>
[BZ #22377]
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 81c2932..6bc4102 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -3433,7 +3433,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
/* This isn't a valid character. */
return REG_ECOLLATE;
- /* Build single byte matcing table for this equivalence class. */
+ /* Build single byte matching table for this equivalence class. */
len = weights[idx1 & 0xffffff];
for (ch = 0; ch < SBC_MAX; ++ch)
{
diff --git a/posix/regex.h b/posix/regex.h
index 3f0d6ce..0074b8a 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -317,7 +317,7 @@ typedef enum
/* POSIX regcomp return error codes. (In the order listed in the
standard.) */
REG_BADPAT, /* Invalid pattern. */
- REG_ECOLLATE, /* Inalid collating element. */
+ REG_ECOLLATE, /* Invalid collating element. */
REG_ECTYPE, /* Invalid character class name. */
REG_EESCAPE, /* Trailing backslash. */
REG_ESUBREG, /* Invalid back reference. */
diff --git a/posix/regex_internal.c b/posix/regex_internal.c
index 111231c..a97f703 100644
--- a/posix/regex_internal.c
+++ b/posix/regex_internal.c
@@ -1594,7 +1594,7 @@ free_state (re_dfastate_t *state)
re_free (state);
}
-/* Create the new state which is independ of contexts.
+/* Create the new state which is independent of contexts.
Return the new state if succeeded, otherwise return NULL. */
static re_dfastate_t *
diff --git a/posix/regexec.c b/posix/regexec.c
index a96d86d..95e31d3 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -266,7 +266,7 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
concerned.
If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match
- and all groups is stroed in REGS. (For the "_2" variants, the offsets are
+ and all groups is stored in REGS. (For the "_2" variants, the offsets are
computed relative to the concatenation, not relative to the individual
strings.)
@@ -568,7 +568,7 @@ re_exec (const char *s)
/* Searches for a compiled pattern PREG in the string STRING, whose
length is LENGTH. NMATCH, PMATCH, and EFLAGS have the same
- mingings with regexec. START, and RANGE have the same meanings
+ meaning as with regexec. START, and RANGE have the same meanings
with re_search.
Return REG_NOERROR if we find a match, and REG_NOMATCH if not,
otherwise return the error code.
@@ -849,7 +849,7 @@ re_search_internal (const regex_t *preg, const char *string, int length,
goto free_return;
}
- /* At last, add the offset to the each registers, since we slided
+ /* At last, add the offset to each register, since we slid
the buffers so that we could assume that the matching starts
from 0. */
for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
@@ -2365,7 +2365,7 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
/* From the node set CUR_NODES, pick up the nodes whose types are
OP_OPEN_SUBEXP and which have corresponding back references in the regular
expression. And register them to use them later for evaluating the
- correspoding back references. */
+ corresponding back references. */
static reg_errcode_t
check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
posix/regcomp.c | 2 +-
posix/regex.h | 2 +-
posix/regex_internal.c | 2 +-
posix/regexec.c | 8 ++++----
5 files changed, 14 insertions(+), 7 deletions(-)
hooks/post-receive
--
GNU C Library master sources