summaryrefslogtreecommitdiff
path: root/regenc.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-30 02:08:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-30 02:08:54 +0000
commit23a32d6444cea5b1719edc42d63911e108d3086e (patch)
treeccbb65883a860cf72c3427345134b8edafe735c0 /regenc.c
parent88ca298efbb004600e1853cef872038f78843252 (diff)
* include/ruby/oniguruma.h, include/ruby/re.h, re.c, regcomp.c,
regenc.c, regerror.c, regexec.c, regint.h, regparse.c: use long. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regenc.c')
-rw-r--r--regenc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/regenc.c b/regenc.c
index b625e63048..bb180367da 100644
--- a/regenc.c
+++ b/regenc.c
@@ -57,7 +57,7 @@ onigenc_mbclen_approximate(const OnigUChar* p,const OnigUChar* e, struct OnigEnc
if (ONIGENC_MBCLEN_CHARFOUND_P(ret))
return ONIGENC_MBCLEN_CHARFOUND_LEN(ret);
else if (ONIGENC_MBCLEN_NEEDMORE_P(ret))
- return e-p+ONIGENC_MBCLEN_NEEDMORE_LEN(ret);
+ return (int)(e-p)+ONIGENC_MBCLEN_NEEDMORE_LEN(ret);
return 1;
}
@@ -757,7 +757,7 @@ onigenc_mb2_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
if (enclen(enc, buf, p) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
#endif
- return p - buf;
+ return (int)(p - buf);
}
extern int
@@ -780,7 +780,7 @@ onigenc_mb4_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
if (enclen(enc, buf, p) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
#endif
- return p - buf;
+ return (int)(p - buf);
}
extern int
@@ -870,7 +870,7 @@ onigenc_with_ascii_strncmp(OnigEncoding enc, const UChar* p, const UChar* end,
static int
resize_property_list(int new_size, const OnigCodePoint*** plist, int* psize)
{
- int size;
+ size_t size;
const OnigCodePoint **list = *plist;
size = sizeof(OnigCodePoint*) * new_size;
itle='2016-04-06 06:01:14 +0000'>2016-04-06* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.3.hsbt 2016-02-01* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.hsbt 2015-12-16Add frozen_string_literal: false for all filesnaruse 2015-07-01* lib/rubygems: Update to RubyGems HEAD(c202db2).hsbt 2013-11-12* lib/rubygems: Update to RubyGems master b9213d7. Changes include:drbrain 2013-10-16* lib/rubygems: Update to RubyGems master commit 2a74263. This fixesdrbrain 2013-09-18* lib/rubygems: Update to RubyGems 2.2.0.preview.1drbrain 2013-07-22* lib/rubygems: Import RubyGems from master as of commit b165260drbrain 2013-03-05* lib/rubygems/commands/query_command.rb: Only fetch remote specs whendrbrain 2013-01-04* lib/rubygems/doctor.rb: Process directories in order in case thedrbrain 2012-12-19* lib/rubygems/commands/query_command.rb: Refactored to improvedrbrain 2012-11-29* lib/rubygems*: Updated to RubyGems 2.0drbrain 2011-07-27 * lib/rubygems: Update to RubyGems 1.8.6.1.drbrain 2011-06-01Import rubygems 1.8.5 (released @ 137c80f)ryan 2011-01-28Import rubygems 1.5.0 (release candidate @ 09893d9)ryan 2011-01-19Import rubygems 1.5.0 (release candidate)ryan 2010-04-22Update to RubyGems 1.3.7.pre.1drbrain 2010-02-22* lib/rubygems: update to 1.3.6.nobu 2009-10-03* test/rubygems: use require_relative.nobu 2009-06-09Update to RubyGems 1.3.4 r2223drbrain 2008-10-25Update to RubyGems 1.3.1 r1909.drbrain 2008-09-25Update to RubyGems 1.3.0 r1891drbrain 2008-06-17Update RubyGems to 1.1.1 r1778 (almost 1.2)drbrain 2008-04-11Update to RubyGems 1.1.1 r1701.drbrain 2008-03-31Import RubyGems 1.1.0drbrain 2007-12-20Import RubyGems 1.0.0, r1575drbrain 2007-11-10Import RubyGems trunk revision 1493.drbrain