diff options
| author | Arthur Schreiber <arthurschreiber@github.com> | 2016-10-06 13:15:31 +0200 |
|---|---|---|
| committer | Arthur Schreiber <arthurschreiber@github.com> | 2016-10-06 13:15:31 +0200 |
| commit | ab96ca5572f1aae6bc7f889fbd46f56fc959ba2b (patch) | |
| tree | 4bb04769f4b5b9081d4516a4075953fc4c80ec63 /src/diff_driver.c | |
| parent | e8ab13b3fd8485086c2a906dac85ecc8fa162d84 (diff) | |
| download | libgit2-ab96ca5572f1aae6bc7f889fbd46f56fc959ba2b.tar.gz | |
Make sure we use the `C` locale for `regcomp` on macOS.
Diffstat (limited to 'src/diff_driver.c')
| -rw-r--r-- | src/diff_driver.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/diff_driver.c b/src/diff_driver.c index 14a898c4f..1a7f09a44 100644 --- a/src/diff_driver.c +++ b/src/diff_driver.c @@ -114,7 +114,7 @@ static int diff_driver_add_patterns( if (error < 0) break; - if ((error = regcomp(&pat->re, buf.ptr, regex_flags)) != 0) { + if ((error = p_regcomp(&pat->re, buf.ptr, regex_flags)) != 0) { /* * TODO: issue a warning */ @@ -210,7 +210,7 @@ static int git_diff_driver_builtin( goto done; if (ddef->words && - (error = regcomp( + (error = p_regcomp( &drv->word_pattern, ddef->words, ddef->flags | REG_EXTENDED))) { error = giterr_set_regex(&drv->word_pattern, error); @@ -314,7 +314,7 @@ static int git_diff_driver_load( goto done; if (!ce || !ce->value) /* no diff.<driver>.wordregex, so just continue */; - else if (!(error = regcomp(&drv->word_pattern, ce->value, REG_EXTENDED))) + else if (!(error = p_regcomp(&drv->word_pattern, ce->value, REG_EXTENDED))) found_driver = true; else { /* TODO: warn about bad regex instead of failure */ @@ -519,4 +519,3 @@ void git_diff_find_context_clear(git_diff_find_context_payload *payload) payload->driver = NULL; } } - |