On Thu, Apr 11, 2013 at 4:55 PM, Stefano Lattarini <stefano.lattarini@xxxxxxxxx> wrote: > Mostly suggested by codespell <https://github.com/lucasdemarchi/codespell> > > Signed-off-by: Stefano Lattarini <stefano.lattarini@xxxxxxxxx> > --- > diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c > index 8c96ed9..aab8153 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 is occurred, ERR is set by error code, and return NULL. Not new in this patch, but the grammar "error is occurred" is rather poor. Since this is a cleanup patch, perhaps it makes sense to adjust the grammar as well. > 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 is occurred. */ Also not new with the patch: s/If/if/ Ditto regarding grammar. > diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c > index 193854c..237642c 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 is occurred, return 1 otherwise. */ Ditto: grammar > > 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 is occurred, return 1 otherwise. */ Grammar. > static int > internal_function > @@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx) > > > /* 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 will be occurred. */ Grammar. > diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh > index b6405ce..e764ddc 100755 > --- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh > +++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh > -test_expect_failure 'test of correct formating for file name begining with special character' ' > +test_expect_failure 'test of correct formating for file name beginning with special character' ' Missed by codespell: s/formating/formatting/ > wiki_reset && > git clone mediawiki::'"$WIKI_URL"' mw_dir_13 && > ( > @@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci Ditto: s/formating/formatting/ > echo "my new file {char_1" >\{char_1.mw && > echo "my new file [char_2" >\[char_2.mw && > git add . && > - git commit -am "commiting some exotic file name..." && > + git commit -am "committing some exotic file name..." && > git push && > git pull > ) && > @@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' ' s/formating/formatting/ > echo "my new file char{_1" >Char\{_1.mw && > echo "my new file char[_2" >Char\[_2.mw && > git add . && > - git commit -m "commiting some exotic file name..." && > + git commit -m "committing some exotic file name..." && > git push > ) && > wiki_getallpage ref_page_14 && -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html