From 65736fa36c05168ad2ff801a095d105a48feebf1 Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Sun, 14 Jul 2013 23:42:31 +0900 Subject: Replace 0 with NULL because struct pointer is set NULL in. --- src/pool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/pool.c') diff --git a/src/pool.c b/src/pool.c index c992b5e53..19298c9ee 100644 --- a/src/pool.c +++ b/src/pool.c @@ -53,7 +53,7 @@ mrb_pool_open(mrb_state *mrb) if (pool) { pool->mrb = mrb; - pool->pages = 0; + pool->pages = NULL; } return pool; @@ -96,7 +96,7 @@ mrb_pool_alloc(mrb_pool *pool, size_t len) struct mrb_pool_page *page; size_t n; - if (!pool) return 0; + if (!pool) return NULL; len += ALIGN_PADDING(len); page = pool->pages; while (page) { @@ -109,7 +109,7 @@ mrb_pool_alloc(mrb_pool *pool, size_t len) page = page->next; } page = page_alloc(pool, len); - if (!page) return 0; + if (!page) return NULL; page->offset = len; page->next = pool->pages; pool->pages = page; @@ -145,7 +145,7 @@ mrb_pool_realloc(mrb_pool *pool, void *p, size_t oldlen, size_t newlen) struct mrb_pool_page *page; void *np; - if (!pool) return 0; + if (!pool) return NULL; oldlen += ALIGN_PADDING(oldlen); newlen += ALIGN_PADDING(newlen); page = pool->pages; @@ -177,7 +177,7 @@ main(void) mrb_pool *pool; void *p; - pool = mrb_pool_open(0); + pool = mrb_pool_open(NULL); p = mrb_pool_alloc(pool, len); for (i=1; i<20; i++) { printf("%p (len=%d) %d\n", p, len, mrb_pool_can_realloc(pool, p, len*2)); -- cgit v1.2.3 From efac8db6748ef95c52de32b16a534f7b8cbf982d Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Sun, 14 Jul 2013 23:44:29 +0900 Subject: Replace int with mrb_bool because a return value is boolean. --- include/mruby.h | 2 +- src/pool.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pool.c') diff --git a/include/mruby.h b/include/mruby.h index e5a5f2c69..a7f2a49c4 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -378,7 +378,7 @@ struct mrb_pool* mrb_pool_open(mrb_state*); void mrb_pool_close(struct mrb_pool*); void* mrb_pool_alloc(struct mrb_pool*, size_t); void* mrb_pool_realloc(struct mrb_pool*, void*, size_t oldlen, size_t newlen); -int mrb_pool_can_realloc(struct mrb_pool*, void*, size_t); +mrb_bool mrb_pool_can_realloc(struct mrb_pool*, void*, size_t); void* mrb_alloca(mrb_state *mrb, size_t); #if defined(__cplusplus) diff --git a/src/pool.c b/src/pool.c index c992b5e53..81fb83c0c 100644 --- a/src/pool.c +++ b/src/pool.c @@ -118,7 +118,7 @@ mrb_pool_alloc(mrb_pool *pool, size_t len) return page->last; } -int +mrb_bool mrb_pool_can_realloc(mrb_pool *pool, void *p, size_t len) { struct mrb_pool_page *page; @@ -180,7 +180,7 @@ main(void) pool = mrb_pool_open(0); p = mrb_pool_alloc(pool, len); for (i=1; i<20; i++) { - printf("%p (len=%d) %d\n", p, len, mrb_pool_can_realloc(pool, p, len*2)); + printf("%p (len=%d) %ud\n", p, len, mrb_pool_can_realloc(pool, p, len*2)); p = mrb_pool_realloc(pool, p, len, len*2); len *= 2; } -- cgit v1.2.3