aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-22 07:27:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-22 07:27:51 +0000
commit01f3f86472c02fcf1ac456549de440361553e9c0 (patch)
treec92f2cddbff4b29acd28f248f70a4f097b759b5a
parent62f073a3864ab89cbb0a1995100b85a1686ddfb8 (diff)
downloadruby-01f3f86472c02fcf1ac456549de440361553e9c0.tar.gz
* regerror.c (onig_error_code_to_str, onig_snprintf_with_pattern):
fixed type. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--regerror.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 95c5f0ff86..8d1eca4dc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Tue Sep 22 16:26:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Sep 22 16:27:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * regerror.c (onig_error_code_to_str, onig_snprintf_with_pattern):
+ fixed type.
* regparse.c (st_str_end_key, str_end_cmp, str_end_hash):
constified.
diff --git a/regerror.c b/regerror.c
index eb671386f1..358ce0ce5a 100644
--- a/regerror.c
+++ b/regerror.c
@@ -309,7 +309,7 @@ onig_error_code_to_str(s, code, va_alist)
}
va_end(vargs);
- return len;
+ return (int)len;
}
@@ -340,7 +340,7 @@ onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
need = (pat_end - pat) * 4 + 4;
- if (n + need < bufsize) {
+ if (n + need < (size_t)bufsize) {
strcat((char* )buf, ": /");
s = buf + onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, buf);