diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-21 13:06:17 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-21 13:06:17 +0000 |
| commit | 9848f0d0ca3b086383a0df3a5baed973b6bafa26 (patch) | |
| tree | 152a08761b9f9f45cd1fec1d17c414d337a7205f /win32/win32.c | |
| parent | 315bf4b6d726c7a26fe1ae75889056cba90cb472 (diff) | |
| download | ruby-9848f0d0ca3b086383a0df3a5baed973b6bafa26.tar.gz | |
* win32/{dir.h,win32.c} (rb_w32_readdir): removed old rb_w32_readdir()
and renamed from rb_w32_readdir_with_enc().
[ruby-core:24864] [Feature #1927]
* dir.c (READDIR): follow above change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
| -rw-r--r-- | win32/win32.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/win32/win32.c b/win32/win32.c index d68a295f91..3b827662a7 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2025,16 +2025,9 @@ readdir_internal(DIR *dirp, BOOL (*conv)(const WCHAR *, struct direct *, rb_enco /* License: Ruby's */ struct direct * -rb_w32_readdir(DIR *dirp) +rb_w32_readdir(DIR *dirp, rb_encoding *enc) { - return readdir_internal(dirp, win32_direct_conv, NULL); -} - -/* License: Ruby's */ -struct direct * -rb_w32_readdir_with_enc(DIR *dirp, rb_encoding *enc) -{ - if (enc == rb_ascii8bit_encoding()) + if (!enc || enc == rb_ascii8bit_encoding()) return readdir_internal(dirp, win32_direct_conv, NULL); else return readdir_internal(dirp, ruby_direct_conv, enc); |