diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
| commit | caa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch) | |
| tree | bbfbe6ac84575766b4752e48960d12288a8b6c42 /compat/regex/regex_internal.c | |
| parent | e2af9e361b1d7452492baa073790b19292f9c038 (diff) | |
| parent | a46221e9adcf3deb88c4fc904859205bf87f784c (diff) | |
| download | git-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.gz git-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.xz | |
Sync with 'maint'
* maint:
Correct common spelling mistakes in comments and tests
kwset: fix spelling in comments
precompose-utf8: fix spelling of "want" in error message
compat/nedmalloc: fix spelling in comments
compat/regex: fix spelling and grammar in comments
obstack: fix spelling of similar
contrib/subtree: fix spelling of accidentally
git-remote-mediawiki: spelling fixes
doc: various spelling fixes
fast-export: fix argument name in error messages
Documentation: distinguish between ref and offset deltas in pack-format
i18n: make the translation of -u advice in one go
Diffstat (limited to 'compat/regex/regex_internal.c')
| -rw-r--r-- | compat/regex/regex_internal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c index 193854cf5..d4121f2f4 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) /* 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 |