From 5a12fb5fb87fe373ad251d68752388148c1363a3 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 7 Sep 2009 08:13:55 +0000 Subject: * io.c (io_encname_bom_p): removed magic number. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb0d906db0..4af7f3e423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Sep 7 17:13:53 2009 Nobuyoshi Nakada + + * io.c (io_encname_bom_p): removed magic number. + Mon Sep 7 12:26:04 2009 Yukihiro Matsumoto * lib/irb/inspector.rb (IRB::INSPECTORS.def_inspector): support diff --git a/io.c b/io.c index 3391bea4d0..31a86da6b9 100644 --- a/io.c +++ b/io.c @@ -3938,11 +3938,13 @@ rb_io_fmode_modestr(int fmode) static int io_encname_bom_p(const char *name, long len) { + static const char bom_prefix[] = "bom|utf-"; + enum {bom_prefix_len = (int)sizeof(bom_prefix) - 1}; if (!len) { const char *p = strchr(name, ':'); - len = p ? p - name : strlen(name); + len = p ? (long)(p - name) : (long)strlen(name); } - return len > 8 && STRNCASECMP(name, "bom|utf-", 8) == 0; + return len > bom_prefix_len && STRNCASECMP(name, bom_prefix, bom_prefix_len) == 0; } int -- cgit v1.2.3