admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61 from pbhogan/fix-warnings

Browse Source 
Fix various warnings
This commit is contained in:
Yukihiro "Matz" Matsumoto
2012-04-27 08:56:39 -07:00
parent fdd4920ffd f9647592ef
commit 2b6be16308
15 changed files with 56 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/variable.c
+3 -6
View File
@@ -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;
}