ruby-changes:18741
From: naruse <ko1@a...>
Date: Thu, 3 Feb 2011 09:39:05 +0900 (JST)
Subject: [ruby-changes:18741] Ruby:r30768 (trunk): * include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n'
naruse 2011-02-03 09:38:55 +0900 (Thu, 03 Feb 2011) New Revision: 30768 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30768 Log: * include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n' as int because Ruby usually treats length value as long but onigenc_step_back's 4th argument is int. Modified files: trunk/ChangeLog trunk/include/ruby/encoding.h Index: include/ruby/encoding.h =================================================================== --- include/ruby/encoding.h (revision 30767) +++ include/ruby/encoding.h (revision 30768) @@ -162,7 +162,7 @@ /* start, ptr, end, encoding -> next_char */ #define rb_enc_left_char_head(s,p,e,enc) (char *)onigenc_get_left_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e)) #define rb_enc_right_char_head(s,p,e,enc) (char *)onigenc_get_right_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e)) -#define rb_enc_step_back(s,p,e,n,enc) (char *)onigenc_step_back(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e),(n)) +#define rb_enc_step_back(s,p,e,n,enc) (char *)onigenc_step_back(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e),(int)(n)) /* ptr, ptr, encoding -> newline_or_not */ #define rb_enc_is_newline(p,end,enc) ONIGENC_IS_MBC_NEWLINE(enc,(UChar*)(p),(UChar*)(end)) Index: ChangeLog =================================================================== --- ChangeLog (revision 30767) +++ ChangeLog (revision 30768) @@ -1,3 +1,9 @@ +Wed Feb 2 20:25:04 2011 NARUSE, Yui <naruse@r...> + + * include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n' + as int because Ruby usually treats length value as long but + onigenc_step_back's 4th argument is int. + Thu Feb 3 07:20:46 2011 Aaron Patterson <aaron@t...> * ext/psych/lib/psych/visitors/to_ruby.rb: use Regexp::NOENCODING -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/