diff options
| author | Masaki Muranaka <[email protected]> | 2013-01-09 13:29:59 +0900 |
|---|---|---|
| committer | Masaki Muranaka <[email protected]> | 2013-01-09 13:29:59 +0900 |
| commit | 81b6895885f76c5638628471c4d11d020a555d55 (patch) | |
| tree | d6c9797b17d57306b46f17f810f197cd478c71de /src | |
| parent | 0b337accad67e8855a574e8524b5a1ceed162bd3 (diff) | |
| parent | 2c6d34f109c556b8e825aaeb2642f4377ae2f88e (diff) | |
| download | mruby-81b6895885f76c5638628471c4d11d020a555d55.tar.gz mruby-81b6895885f76c5638628471c4d11d020a555d55.zip | |
Merge branch 'master' of github.com:mruby/mruby into pr-strict-error-checking
Diffstat (limited to 'src')
| -rw-r--r-- | src/cdump.c | 3 | ||||
| -rw-r--r-- | src/dump.c | 6 | ||||
| -rw-r--r-- | src/load.c | 9 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/cdump.c b/src/cdump.c index 89ae0bbff..7cb159046 100644 --- a/src/cdump.c +++ b/src/cdump.c @@ -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; } diff --git a/src/dump.c b/src/dump.c index d26372ee3..71fe12bf0 100644 --- a/src/dump.c +++ b/src/dump.c @@ -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); } diff --git a/src/load.c b/src/load.c index f434fdd74..44bf32ae7 100644 --- a/src/load.c +++ b/src/load.c @@ -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; } |