nobu	2008-01-08 15:40:33 +0900 (Tue, 08 Jan 2008)

  New Revision: 14946

  Modified files:
    trunk/ChangeLog
    trunk/enc/unicode.c
    trunk/enc/utf16_be.c
    trunk/enc/utf16_le.c
    trunk/enc/utf32_be.c
    trunk/enc/utf32_le.c
    trunk/regenc.c
    trunk/regenc.h

  Log:
    * regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed
      warnings.
    
    * regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added
      encoding argument.
    
    * enc/utf{16,32}_{be,le}.c: added init functions.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/utf32_be.c?r1=14946&r2=14945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/unicode.c?r1=14946&r2=14945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14946&r2=14945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regenc.c?r1=14946&r2=14945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/utf32_le.c?r1=14946&r2=14945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regenc.h?r1=14946&r2=14945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/utf16_be.c?r1=14946&r2=14945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/utf16_le.c?r1=14946&r2=14945&diff_format=u

Index: regenc.c
===================================================================
--- regenc.c	(revision 14945)
+++ regenc.c	(revision 14946)
@@ -125,7 +125,7 @@
 {
   int n = 0;
   UChar* p = (UChar* )s;
-  UChar* e = p + strlen(s);
+  UChar* e = p + strlen((const char *)s);
   
   while (1) {
     if (*p == '\0') {
@@ -151,7 +151,7 @@
 {
   UChar* start = (UChar* )s;
   UChar* p = (UChar* )s;
-  UChar* e = p + strlen(s);
+  UChar* e = p + strlen((const char *)s);
 
   while (1) {
     if (*p == '\0') {
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14945)
+++ ChangeLog	(revision 14946)
@@ -1,5 +1,13 @@
-Tue Jan  8 15:27:20 2008  Nobuyoshi Nakada  <nobu@r...>
+Tue Jan  8 15:40:31 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed
+	  warnings.
+
+	* regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added
+	  encoding argument.
+
+	* enc/utf{16,32}_{be,le}.c: added init functions.
+
 	* enc/utf{16,32}_{be,le}.c: imported from Oniguruma 5.9.1.
 
 Tue Jan  8 15:03:10 2008  Tanaka Akira  <akr@f...>
Index: regenc.h
===================================================================
--- regenc.h	(revision 14945)
+++ regenc.h	(revision 14946)
@@ -145,7 +145,7 @@
 
 /* in enc/unicode.c */
 ONIG_EXTERN int onigenc_unicode_is_code_ctype P_((OnigCodePoint code, unsigned int ctype, OnigEncoding enc));
-ONIG_EXTERN int onigenc_utf16_32_get_ctype_code_range P_((OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[]));
+ONIG_EXTERN int onigenc_utf16_32_get_ctype_code_range P_((OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[], OnigEncoding enc));
 ONIG_EXTERN int onigenc_unicode_ctype_code_range P_((int ctype, const OnigCodePoint* ranges[]));
 ONIG_EXTERN int onigenc_unicode_get_case_fold_codes_by_str P_((OnigEncoding enc, OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]));
 ONIG_EXTERN int onigenc_unicode_mbc_case_fold P_((OnigEncoding enc, OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* fold));
Index: enc/utf32_be.c
===================================================================
--- enc/utf32_be.c	(revision 14945)
+++ enc/utf32_be.c	(revision 14946)
@@ -173,7 +173,7 @@
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF32_BE = {
+OnigEncodingDefine(utf32_be, UTF32_BE) = {
   utf32be_mbc_enc_len,
   "UTF-32BE",   /* name */
   4,            /* max byte length */
Index: enc/utf16_be.c
===================================================================
--- enc/utf16_be.c	(revision 14945)
+++ enc/utf16_be.c	(revision 14946)
@@ -217,7 +217,7 @@
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF16_BE = {
+OnigEncodingDefine(utf16_be, UTF16_BE) = {
   utf16be_mbc_enc_len,
   "UTF-16BE",   /* name */
   4,            /* max byte length */
Index: enc/utf32_le.c
===================================================================
--- enc/utf32_le.c	(revision 14945)
+++ enc/utf32_le.c	(revision 14946)
@@ -173,7 +173,7 @@
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF32_LE = {
+OnigEncodingDefine(utf32_le, UTF32_LE) = {
   utf32le_mbc_enc_len,
   "UTF-32LE",   /* name */
   4,            /* max byte length */
Index: enc/utf16_le.c
===================================================================
--- enc/utf16_le.c	(revision 14945)
+++ enc/utf16_le.c	(revision 14946)
@@ -218,7 +218,7 @@
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF16_LE = {
+OnigEncodingDefine(utf16_le, UTF16_LE) = {
   utf16le_mbc_enc_len,
   "UTF-16LE",   /* name */
   4,            /* max byte length */
Index: enc/unicode.c
===================================================================
--- enc/unicode.c	(revision 14945)
+++ enc/unicode.c	(revision 14946)
@@ -10781,7 +10781,8 @@
 
 extern int
 onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
-                                      const OnigCodePoint* ranges[])
+                                      const OnigCodePoint* ranges[],
+				      struct OnigEncodingTypeST* enc ARG_UNUSED)
 {
   *sb_out = 0x00;
   return onigenc_unicode_ctype_code_range(ctype, ranges);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml