summaryrefslogtreecommitdiffhomepage
path: root/src/string.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-03-05 06:22:43 -0800
committerYukihiro "Matz" Matsumoto <[email protected]>2013-03-05 06:22:43 -0800
commit6d0e2519dd3e432339b1cb75a0379df6cb8ff518 (patch)
tree09072aeb907d7d00102dcc44f4dc45b459e31dbd /src/string.c
parent83c5274a71ea7fc40427029033edc99224e008e0 (diff)
parent4bc43803353560a9b9a54c0d568dd154ab3422fb (diff)
downloadmruby-6d0e2519dd3e432339b1cb75a0379df6cb8ff518.tar.gz
mruby-6d0e2519dd3e432339b1cb75a0379df6cb8ff518.zip
Merge pull request #952 from kano4/master
Add include guard in node.h and Replace tabs with spaces
Diffstat (limited to 'src/string.c')
-rw-r--r--src/string.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/string.c b/src/string.c
index 679b06f9e..cfef5730c 100644
--- a/src/string.c
+++ b/src/string.c
@@ -62,7 +62,7 @@ str_modify(mrb_state *mrb, struct RString *s)
len = s->len;
ptr = (char *)mrb_malloc(mrb, len+1);
if (p) {
- memcpy(ptr, p, len);
+ memcpy(ptr, p, len);
}
ptr[len] = 0;
s->ptr = ptr;
@@ -931,8 +931,8 @@ mrb_str_chomp_bang(mrb_state *mrb, mrb_value str)
if (s->ptr[len-1] == '\n') {
s->len--;
if (s->len > 0 &&
- s->ptr[s->len-1] == '\r') {
- s->len--;
+ s->ptr[s->len-1] == '\r') {
+ s->len--;
}
}
else if (s->ptr[len-1] == '\r') {