diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-04-27 08:56:39 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-04-27 08:56:39 -0700 |
| commit | 2b6be163082927ecdfa203b68639a8ff303469e6 (patch) | |
| tree | 43b1b48dd938f508bc9c6e71f273a17cf7764f7a /src/variable.c | |
| parent | fdd4920ffdf098fd245079d6c0a881c42b776971 (diff) | |
| parent | f9647592ef940271ff2c45ef2c1e42989646cdb7 (diff) | |
| download | mruby-2b6be163082927ecdfa203b68639a8ff303469e6.tar.gz mruby-2b6be163082927ecdfa203b68639a8ff303469e6.zip | |
Merge pull request #61 from pbhogan/fix-warnings
Fix various warnings
Diffstat (limited to 'src/variable.c')
| -rw-r--r-- | src/variable.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/variable.c b/src/variable.c index 7116155a7..5aba846b1 100644 --- a/src/variable.c +++ b/src/variable.c @@ -61,7 +61,6 @@ mrb_gc_mark_iv(mrb_state *mrb, struct RObject *obj) size_t mrb_gc_mark_iv_size(mrb_state *mrb, struct RObject *obj) { - khiter_t k; struct kh_iv *h = obj->iv; if (!h) return 0; @@ -115,9 +114,8 @@ static void ivset(mrb_state *mrb, struct kh_iv *h, mrb_sym sym, mrb_value v) { khiter_t k; - int r; - k = kh_put(iv, h, sym, &r); + k = kh_put(iv, h, sym); kh_value(h, k) = v; } @@ -180,14 +178,13 @@ mrb_vm_cv_set(mrb_state *mrb, mrb_sym sym, mrb_value v) struct RClass *c = mrb->ci->target_class; khash_t(iv) *h; khiter_t k; - int r; while (c) { if (c->iv) { h = c->iv; k = kh_get(iv, h, sym); if (k != kh_end(h)) { - k = kh_put(iv, h, sym, &r); + k = kh_put(iv, h, sym); kh_value(h, k) = v; } } @@ -195,7 +192,7 @@ mrb_vm_cv_set(mrb_state *mrb, mrb_sym sym, mrb_value v) } c = mrb->ci->target_class; h = c->iv = kh_init(iv, mrb); - k = kh_put(iv, h, sym, &r); + k = kh_put(iv, h, sym); kh_value(h, k) = v; } |
