diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-14 17:24:21 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-14 17:24:21 +0100 |
commit | 05d45168211fcd8f85df98e57f27785a0f739ce1 (patch) | |
tree | f2ff65f772ce0ea74533165cb9a71e0c7c0a1cf3 /src/regerror.c | |
parent | 4fdc47601d9e68343fa6818beda4c6a2012baccd (diff) | |
parent | 0801ae9d92abbf9942f89f48b2dd851650df21be (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/regerror.c')
-rw-r--r-- | src/regerror.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/regerror.c b/src/regerror.c index c0d2346..e7d2570 100644 --- a/src/regerror.c +++ b/src/regerror.c @@ -236,7 +236,7 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end, *is_over = ((p < end) ? 1 : 0); } else { - len = MIN((end - s), buf_size); + len = MIN((int )(end - s), buf_size); xmemcpy(buf, s, (size_t )len); *is_over = ((buf_size < (end - s)) ? 1 : 0); } @@ -300,7 +300,7 @@ onig_error_code_to_str(s, code, va_alist) } } *p = '\0'; - len = p - s; + len = (int )(p - s); break; default: @@ -340,7 +340,7 @@ onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist) n = xvsnprintf((char* )buf, bufsize, (const char* )fmt, args); va_end(args); - need = (pat_end - pat) * 4 + 4; + need = (int )(pat_end - pat) * 4 + 4; if (n + need < bufsize) { xstrcat((char* )buf, ": /", bufsize); |