nobu	2009-09-07 17:13:55 +0900 (Mon, 07 Sep 2009)

  New Revision: 24781

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24781

  Log:
    * io.c (io_encname_bom_p): removed magic number.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24780)
+++ ChangeLog	(revision 24781)
@@ -1,3 +1,7 @@
+Mon Sep  7 17:13:53 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (io_encname_bom_p): removed magic number.
+
 Mon Sep  7 12:26:04 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/irb/inspector.rb (IRB::INSPECTORS.def_inspector): support
Index: io.c
===================================================================
--- io.c	(revision 24780)
+++ io.c	(revision 24781)
@@ -3938,11 +3938,13 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/