From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Stefano Lattarini" <stefano.lattarini@gmail.com>,
sunshine@sunshineco.com, git@vger.kernel.org,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 05/10] compat/regex: fix spelling and grammar in comments
Date: Fri, 12 Apr 2013 00:01:07 -0700 [thread overview]
Message-ID: <20130412070107.GF5710@elie.Belkin> (raw)
In-Reply-To: <20130412064837.GA5710@elie.Belkin>
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Some of these were found using Lucas De Marchi's codespell tool.
Others noticed by Eric Sunshine.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Is gawk the appropriate upstream to send this sort of readability
improvement to?
compat/regex/regcomp.c | 4 ++--
compat/regex/regex.c | 2 +-
compat/regex/regex_internal.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index 8c96ed94..d0025bd5 100644
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
/* Entry point of the parser.
Parse the regular expression REGEXP and return the structure tree.
- If an error is occured, ERR is set by error code, and return NULL.
+ If an error has occurred, ERR is set by error code, and return NULL.
This function build the following tree, from regular expression <reg_exp>:
CAT
/ \
@@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
/* This is intended for the expressions like "a{1,3}".
Fetch a number from `input', and return the number.
Return -1, if the number field is empty like "{,1}".
- Return -2, If an error is occured. */
+ Return -2, if an error has occurred. */
static int
fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index 3dd8dfa0..6aaae003 100644
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -22,7 +22,7 @@
#include "config.h"
#endif
-/* Make sure noone compiles this code with a C++ compiler. */
+/* Make sure no one compiles this code with a C++ compiler. */
#ifdef __cplusplus
# error "This is C code, use a C compiler"
#endif
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
index 193854cf..d4121f2f 100644
--- a/compat/regex/regex_internal.c
+++ b/compat/regex/regex_internal.c
@@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
/* Insert the new element ELEM to the re_node_set* SET.
SET should not already have ELEM.
- return -1 if an error is occured, return 1 otherwise. */
+ return -1 if an error has occurred, return 1 otherwise. */
static int
internal_function
@@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)
/* Insert the new element ELEM to the re_node_set* SET.
SET should not already have any element greater than or equal to ELEM.
- Return -1 if an error is occured, return 1 otherwise. */
+ Return -1 if an error has occurred, return 1 otherwise. */
static int
internal_function
@@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)
\f
/* Add the token TOKEN to dfa->nodes, and return the index of the token.
- Or return -1, if an error will be occured. */
+ Or return -1, if an error has occurred. */
static int
internal_function
--
1.8.2.1
next prev parent reply other threads:[~2013-04-12 7:01 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-11 20:55 [PATCH] Various typofixes Stefano Lattarini
2013-04-11 21:43 ` Eric Sunshine
2013-04-11 22:36 ` [PATCH v2] Fix various typos and grammaros Stefano Lattarini
2013-04-12 0:45 ` Junio C Hamano
2013-04-12 6:48 ` [RFC/PATCH maint 0/10] " Jonathan Nieder
2013-04-12 6:49 ` [PATCH 01/10] doc: various spelling fixes Jonathan Nieder
2013-04-12 19:12 ` Junio C Hamano
2013-04-12 22:20 ` [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM Jakub Narębski
2013-04-16 3:10 ` Drew Northup
2013-04-16 4:36 ` Junio C Hamano
2013-04-16 7:11 ` Jakub Narębski
2013-04-16 11:51 ` Drew Northup
2013-04-16 11:56 ` Drew Northup
2013-04-16 12:26 ` [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility Jakub Narębski
2013-04-16 12:47 ` Drew Northup
2013-04-16 12:52 ` Drew Northup
2013-04-16 22:26 ` Jonathan Nieder
2013-04-18 1:00 ` Drew Northup
2013-04-18 1:44 ` Junio C Hamano
2013-04-12 6:50 ` [PATCH 02/10] git-remote-mediawiki: spelling fixes Jonathan Nieder
2013-04-12 11:16 ` Matthieu Moy
2013-04-12 6:54 ` [PATCH 03/10] contrib/subtree: fix spelling of accidentally Jonathan Nieder
2013-04-12 6:57 ` [PATCH 04/10] obstack: fix spelling of similar Jonathan Nieder
2013-04-12 7:01 ` Jonathan Nieder [this message]
2013-04-12 7:06 ` [PATCH 06/10] compat/nedmalloc: fix spelling in comments Jonathan Nieder
2013-04-12 7:17 ` Sebastian Schuberth
2013-04-12 7:07 ` [PATCH 07/10] precompose-utf8: fix spelling of "want" in error message Jonathan Nieder
2013-04-12 7:09 ` [PATCH 08/10] kwset: fix spelling in comments Jonathan Nieder
2013-04-12 7:10 ` [PATCH 09/10] git-gui: " Jonathan Nieder
2013-04-12 7:11 ` [PATCH 10/10] Correct common spelling mistakes in comments and tests Jonathan Nieder
2013-04-12 20:39 ` Junio C Hamano
2013-04-12 16:09 ` [RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros Junio C Hamano
2013-04-12 8:16 ` Stefano Lattarini
2013-04-12 16:10 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130412070107.GF5710@elie.Belkin \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stefano.lattarini@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).