summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-30 16:18:40 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-30 16:18:40 +0000
commit985e5d9d7cc4d8f3e2732137d62fa12e1a577ed0 (patch)
treeb91ccfc54b335bbbe32b814afbde845781af741c
parent1204b55db4bf4d79c54111bc74de472a921ecbb6 (diff)
downloadruby-985e5d9d7cc4d8f3e2732137d62fa12e1a577ed0.tar.gz
ruby-985e5d9d7cc4d8f3e2732137d62fa12e1a577ed0.tar.xz
ruby-985e5d9d7cc4d8f3e2732137d62fa12e1a577ed0.zip
* parse.y (magic_comment_encoding): remove meaningless null check.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae55b8ed2..afff8fe6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 31 01:18:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * parse.y (magic_comment_encoding): remove meaningless null check.
+
Thu Jul 31 01:09:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
* ext/bigdecimal/bigdecimal.c (VpIsRoundMode): fix tautology
diff --git a/parse.y b/parse.y
index 1e93d59d1..05f3a91b6 100644
--- a/parse.y
+++ b/parse.y
@@ -5805,7 +5805,7 @@ typedef void (*rb_magic_comment_setter_t)(struct parser_params *parser, const ch
static void
magic_comment_encoding(struct parser_params *parser, const char *name, const char *val)
{
- if (parser && parser->line_count != (parser->has_shebang ? 2 : 1))
+ if (parser->line_count != (parser->has_shebang ? 2 : 1))
return;
parser_set_encode(parser, val);
}