compat/regex: fix spelling and grammar in comments

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>
Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index 8c96ed942c3f7139a4b161c75c6c81e42530c085..d0025bd58d48cfcf137e5ef3bba90881dc00ec68 100644 (file)
--- 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.
 
 /* 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
           / \
    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}".
 /* 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)
 
 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 3dd8dfa01f2a6ab7a197ecddd481704150253c36..6aaae003274e268f274df4b76e02609d5f27e457 100644 (file)
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
 #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
 #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 193854cf5b609d714b03218bd507af840d478c6e..d4121f2f4f1cfa9bf90c22b6e3c944f451225fdf 100644 (file)
--- 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.
 
 /* 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
 
 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.
 
 /* 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
 
 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.
 \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
 
 static int
 internal_function