diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-09-02 21:24:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-09-02 21:24:35 +0200 |
| commit | 7a91eee2e8f26c044c387c9983cde705b7d75482 (patch) | |
| tree | d8d05b34e540ea8025d27516be01b652269e4785 /src | |
| parent | 03b7eafcc5df69453f7407103561546f2edf87d1 (diff) | |
| parent | 4abcda3c3b7d9cb44036840ec0af01d5294dedc5 (diff) | |
Merge tag 'upstream/6.1.1'
Upstream version 6.1.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/oniguruma.h | 2 | ||||
| -rw-r--r-- | src/regcomp.c | 4 | ||||
| -rw-r--r-- | src/regparse.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/oniguruma.h b/src/oniguruma.h index 75301ca..5aa49f6 100644 --- a/src/oniguruma.h +++ b/src/oniguruma.h @@ -36,7 +36,7 @@ extern "C" { #define ONIGURUMA #define ONIGURUMA_VERSION_MAJOR 6 #define ONIGURUMA_VERSION_MINOR 1 -#define ONIGURUMA_VERSION_TEENY 0 +#define ONIGURUMA_VERSION_TEENY 1 #ifdef __cplusplus # ifndef HAVE_PROTOTYPES diff --git a/src/regcomp.c b/src/regcomp.c index 5c0f21f..0235a9f 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -4031,12 +4031,12 @@ distance_value(MinMaxLen* mm) 11, 11, 11, 11, 11, 10, 10, 10, 10, 10 }; - int d; + OnigLen d; if (mm->max == ONIG_INFINITE_DISTANCE) return 0; d = mm->max - mm->min; - if (d < (int )(sizeof(dist_vals)/sizeof(dist_vals[0]))) + if (d < (OnigLen )(sizeof(dist_vals)/sizeof(dist_vals[0]))) /* return dist_vals[d] * 16 / (mm->min + 12); */ return (int )dist_vals[d]; else diff --git a/src/regparse.c b/src/regparse.c index 6be8366..e8a6e20 100644 --- a/src/regparse.c +++ b/src/regparse.c @@ -2302,7 +2302,7 @@ fetch_range_quantifier(UChar** src, UChar* end, OnigToken* tok, ScanEnv* env) invalid: if (syn_allow) { - *src = p; + /* *src = p; */ /* !!! Don't do this line !!! */ return 1; /* OK */ } else |