Merge branch 'master' of github.com:mruby/mruby into pr-strict-error-checking

This commit is contained in:
Masaki Muranaka
2013-01-09 13:29:59 +09:00
3 changed files with 6 additions and 12 deletions
+1 -2
View File
@@ -167,8 +167,7 @@ make_cdump_irep(mrb_state *mrb, int irep_no, FILE *f)
else
SOURCE_CODE0("");
if (buf)
mrb_free(mrb, buf);
mrb_free(mrb, buf);
return MRB_CDUMP_OK;
}
+2 -4
View File
@@ -412,8 +412,7 @@ write_pool_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
}
error_exit:
if (char_buf)
mrb_free(mrb, char_buf);
mrb_free(mrb, char_buf);
return (int)(buf - buf_top);
}
@@ -460,8 +459,7 @@ write_syms_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
}
error_exit:
if (char_buf)
mrb_free(mrb, char_buf);
mrb_free(mrb, char_buf);
return (int)(buf - buf_top);
}
+3 -6
View File
@@ -238,8 +238,7 @@ load_rite_irep_record(mrb_state *mrb, RiteFILE* rfp, unsigned char* dst, uint32_
*len = dst - pStart;
error_exit:
if (char_buf)
mrb_free(mrb, char_buf);
mrb_free(mrb, char_buf);
return MRB_DUMP_OK;
}
@@ -298,8 +297,7 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp)
ret = mrb_read_irep(mrb, (char*)rite_dst);
error_exit:
if (rite_dst)
mrb_free(mrb, rite_dst);
mrb_free(mrb, rite_dst);
return ret;
}
@@ -499,8 +497,7 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
*len = src - recordStart;
error_exit:
if (buf)
mrb_free(mrb, buf);
mrb_free(mrb, buf);
return ret;
}