diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:06:34 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:06:34 +0000 |
| commit | d7baa40cac61f9d3af3c5a8b615ca0dd303cb8c2 (patch) | |
| tree | d40a7d19dded828106e9ab3823708cb01b891f92 /enc | |
| parent | 42eabfcca25d988b764412e18c3dec5208864a7e (diff) | |
* enc/euc_jp.c (property_name_to_ctype): core dumped when sizeof(int)
differs from sizeof(long).
* enc/shift_jis.c (property_name_to_ctype): ditto.
* enc/unicode.c (onigenc_unicode_property_name_to_ctype): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/euc_jp.c | 4 | ||||
| -rw-r--r-- | enc/shift_jis.c | 4 | ||||
| -rw-r--r-- | enc/unicode.c | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/enc/euc_jp.c b/enc/euc_jp.c index 703e0e4f38..6bb4b83f5e 100644 --- a/enc/euc_jp.c +++ b/enc/euc_jp.c @@ -285,11 +285,11 @@ init_property_list(void) static int property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) { - int ctype; + st_data_t ctype; PROPERTY_LIST_INIT_CHECK; - if (onig_st_lookup_strend(PropertyNameTable, p, end, (void*)&ctype) == 0) { + if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) { return onigenc_minimum_property_name_to_ctype(enc, p, end); } diff --git a/enc/shift_jis.c b/enc/shift_jis.c index ba1fde32e8..d5d631e5c5 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -294,11 +294,11 @@ init_property_list(void) static int property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) { - int ctype; + st_data_t ctype; PROPERTY_LIST_INIT_CHECK; - if (onig_st_lookup_strend(PropertyNameTable, p, end, (void*)&ctype) == 0) { + if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) { return onigenc_minimum_property_name_to_ctype(enc, p, end); } diff --git a/enc/unicode.c b/enc/unicode.c index bcd82e54fa..2dfcbba3f6 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -10817,7 +10817,8 @@ static int init_name_ctype_table(void) extern int onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end) { - int len, ctype; + int len; + st_data_t ctype; UChar buf[PROPERTY_NAME_MAX_SIZE]; UChar *p; OnigCodePoint code; @@ -10841,7 +10842,7 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end if (NameTableInited == 0) init_name_ctype_table(); if (onig_st_lookup_strend(NameCtypeTable, buf, buf + len, - (void*)&ctype) == 0) { + &ctype) == 0) { return ONIGERR_INVALID_CHAR_PROPERTY_NAME; } |