summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--dir.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f288e45c1..ed0dc957f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 21 23:47:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (dir_initialize): remove useless intermediate variable.
+
Thu Oct 21 16:07:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_f_select): change rdoc.
diff --git a/dir.c b/dir.c
index a5c6acd827..557f36df13 100644
--- a/dir.c
+++ b/dir.c
@@ -395,11 +395,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
argc = rb_scan_args(argc, argv, "1:", &dirname, &opt);
if (!NIL_P(opt)) {
- VALUE v, enc=Qnil;
-
- v = rb_hash_aref(opt, sym_enc);
- if (!NIL_P(v)) enc = v;
-
+ VALUE enc = rb_hash_aref(opt, sym_enc);
if (!NIL_P(enc)) {
fsenc = rb_to_encoding(enc);
}