From 0a88499f32f38b5608d50da59fc7d22132767c0d Mon Sep 17 00:00:00 2001
From: Yukihiro Matsumoto <matz@ruby-lang.org>
Date: Wed, 27 Jun 2012 15:19:40 +0900
Subject: sizeof("a") is bigger by one than strlen("a")

---
 src/hash.c   |  4 ++--
 src/re.c     | 14 +++++++-------
 src/string.c |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/hash.c b/src/hash.c
index a87ca97d4..888a1917e 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -904,14 +904,14 @@ inspect_hash(mrb_state *mrb, mrb_value hash, int recur)
 
       str2 = mrb_inspect(mrb, kh_key(h,k));
       mrb_str_append(mrb, str, str2);
-      mrb_str_buf_cat(mrb, str, "=>", sizeof("=>"));
+      mrb_str_buf_cat(mrb, str, "=>", 2);
       str2 = mrb_inspect(mrb, kh_value(h,k));
       mrb_str_append(mrb, str, str2);
 
       mrb_gc_arena_restore(mrb, ai);
     }
   }
-  mrb_str_buf_cat(mrb, str, "}", sizeof("}"));
+  mrb_str_buf_cat(mrb, str, "}", 1);
 
   return str;
 }
diff --git a/src/re.c b/src/re.c
index c7b27eac2..3639a41c6 100644
--- a/src/re.c
+++ b/src/re.c
@@ -364,7 +364,7 @@ mrb_reg_desc(mrb_state *mrb, const char *s, long len, mrb_value re)
     if (*option_to_str(opts, RREGEXP(re)->ptr->options))
         mrb_str_buf_cat(mrb, str, opts, strlen(opts));//mrb_str_buf_cat2(str, opts);
     if (RBASIC(re)->flags & REG_ENCODING_NONE)
-        mrb_str_buf_cat(mrb, str, "n", sizeof("n"));
+        mrb_str_buf_cat(mrb, str, "n", 1);
   }
 
   return str;
@@ -1797,9 +1797,9 @@ again:
     mrb_str_buf_cat(mrb, str, optbuf, strlen(optbuf));
   }
 
-  mrb_str_buf_cat(mrb, str, ":", sizeof(":"));
+  mrb_str_buf_cat(mrb, str, ":", 1);
   mrb_reg_expr_str(mrb, str, (char*)ptr, len);
-  mrb_str_buf_cat(mrb, str, ")", sizeof(")"));
+  mrb_str_buf_cat(mrb, str, ")", 1);
 
   return str;
 }
@@ -1925,7 +1925,7 @@ mrb_match_inspect(mrb_state *mrb, mrb_value match)
     for (i = 0; i < num_regs; i++) {
         char buf[sizeof(num_regs)*3+1];
         mrb_value v;
-        mrb_str_buf_cat(mrb, str, " ", sizeof(" "));
+        mrb_str_buf_cat(mrb, str, " ", 1);
         if (0 < i) {
             if (names[i].name)
                 mrb_str_buf_cat(mrb, str, (const char*)names[i].name, names[i].len);
@@ -1933,15 +1933,15 @@ mrb_match_inspect(mrb_state *mrb, mrb_value match)
 	      int n = sprintf(buf, "%d", i);
                 mrb_str_buf_cat(mrb, str, (const char*)buf, n);
             }
-            mrb_str_buf_cat(mrb, str, ":", sizeof(":"));
+            mrb_str_buf_cat(mrb, str, ":", 1);
         }
         v = mrb_reg_nth_match(mrb, i, match);
         if (mrb_nil_p(v))
-            mrb_str_buf_cat(mrb, str, "nil", sizeof("nil"));
+            mrb_str_buf_cat(mrb, str, "nil", 3);
         else
             mrb_str_buf_append(mrb, str, mrb_str_inspect(mrb, v));
     }
-    mrb_str_buf_cat(mrb, str, ">", sizeof(">"));
+    mrb_str_buf_cat(mrb, str, ">", 1);
 
     return str;
 }
diff --git a/src/string.c b/src/string.c
index f01c08bce..8e61e6bb9 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2988,7 +2988,7 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str)
           continue;
       }
     }
-    mrb_str_buf_cat(mrb, result, "\"", sizeof("\""));
+    mrb_str_buf_cat(mrb, result, "\"", 1);
 
     return result;
 }
-- 
cgit v1.2.3