diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:24:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:24:02 -0700 |
| commit | 7e2d574c37c6d53f09ceeb650f7af001aa50e987 (patch) | |
| tree | a68235d36ae82d5401b93ccc2a84c92acaf29cf3 /compat/regex/regexec.c | |
| parent | 2f1ef15070a8664d3194d164f20283d78571e51c (diff) | |
| parent | 84d32bf7678259c08406571cd6ce4b7a6724dcba (diff) | |
| download | git-7e2d574c37c6d53f09ceeb650f7af001aa50e987.tar.gz git-7e2d574c37c6d53f09ceeb650f7af001aa50e987.tar.xz | |
Merge branch 'rj/sparse'
* rj/sparse:
sparse: Fix mingw_main() argument number/type errors
compat/mingw.c: Fix some sparse warnings
compat/win32mmap.c: Fix some sparse warnings
compat/poll/poll.c: Fix a sparse warning
compat/win32/pthread.c: Fix a sparse warning
compat/unsetenv.c: Fix a sparse warning
compat/nedmalloc: Fix compiler warnings on linux
compat/nedmalloc: Fix some sparse warnings
compat/fnmatch/fnmatch.c: Fix a sparse error
compat/regex/regexec.c: Fix some sparse warnings
Diffstat (limited to 'compat/regex/regexec.c')
| -rw-r--r-- | compat/regex/regexec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c index 0194965c5..0cd6e0ef9 100644 --- a/compat/regex/regexec.c +++ b/compat/regex/regexec.c @@ -2313,7 +2313,7 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx, } /* Update the state_log if we need */ -re_dfastate_t * +static re_dfastate_t * internal_function merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, re_dfastate_t *next_state) @@ -2326,7 +2326,7 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, mctx->state_log[cur_idx] = next_state; mctx->state_log_top = cur_idx; } - else if (mctx->state_log[cur_idx] == 0) + else if (mctx->state_log[cur_idx] == NULL) { mctx->state_log[cur_idx] = next_state; } @@ -2392,7 +2392,7 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, /* Skip bytes in the input that correspond to part of a multi-byte match, then look in the log for a state from which to restart matching. */ -re_dfastate_t * +static re_dfastate_t * internal_function find_recover_state (reg_errcode_t *err, re_match_context_t *mctx) { |