This commit was generated by cvs2svn to compensate for changes in r5960,

which included commits to RCS files with non-trunk default branches.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/euc_jp.c b/euc_jp.c
index 848016ba5a..79c1dca454 100644
--- a/euc_jp.c
+++ b/euc_jp.c
@@ -45,20 +45,20 @@ eucjp_code_to_mbc_first(OnigCodePoint code)
     first = (code >> 16) & 0xff;
     /*
     if (enc_len(ONIG_ENCODING_EUC_JP, first) != 3)
-      return ONIGERR_INVALID_WIDE_CHAR_VALUE;
+      return ONIGENCERR_INVALID_WIDE_CHAR_VALUE;
     */
   }
   else if ((code & 0xff00) != 0) {
     first = (code >> 8) & 0xff;
     /*
     if (enc_len(ONIG_ENCODING_EUC_JP, first) != 2)
-      return ONIGERR_INVALID_WIDE_CHAR_VALUE;
+      return ONIGENCERR_INVALID_WIDE_CHAR_VALUE;
     */
   }
   else {
     /*
     if (enc_len(ONIG_ENCODING_EUC_JP, code) != 1)
-      return ONIGERR_INVALID_WIDE_CHAR_VALUE;
+      return ONIGENCERR_INVALID_WIDE_CHAR_VALUE;
     */
     return (int )code;
   }
@@ -76,7 +76,7 @@ eucjp_code_to_mbc(OnigCodePoint code, UChar *buf)
 
 #if 1
   if (enc_len(ONIG_ENCODING_EUC_JP, buf[0]) != (p - buf))
-    return ONIGERR_INVALID_WIDE_CHAR_VALUE;
+    return ONIGENCERR_INVALID_WIDE_CHAR_VALUE;
 #endif  
   return p - buf;
 }
@@ -127,8 +127,8 @@ eucjp_code_is_ctype(OnigCodePoint code, unsigned int ctype)
 static UChar*
 eucjp_left_adjust_char_head(UChar* start, UChar* s)
 {
-  /* Assumed in this encoding,
-     mb-trail bytes don't mix with single bytes.
+  /* In this encoding
+     mb-trail bytes doesn't mix with single bytes.
   */
   UChar *p;
   int len;