Remove unused ret argument from kh_put.

It doesn't appear to serve any purpose and allows removing warning about various unused variables littered around.

Signed-off-by: Patrick Hogan <[email protected]>

4 files changed, 10 insertions, 17 deletions

diff --git a/src/class.c b/src/class.c
index f9d6696ba..879502364 100644
--- a/src/class.c
+++ b/src/class.c
@@ -292,10 +292,9 @@ mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, struct RPro
 {
   khash_t(mt) *h = c->mt;
   khiter_t k;
-  int ret;
 
   if (!h) h = c->mt = kh_init(mt, mrb);
-  k = kh_put(mt, h, mid, &ret);
+  k = kh_put(mt, h, mid);
   kh_value(h, k) = p;
 }
 
@@ -320,10 +319,9 @@ mrb_define_method_vm(mrb_state *mrb, struct RClass *c, mrb_sym name, mrb_value b
 {
   khash_t(mt) *h = c->mt;
   khiter_t k;
-  int ret;
 
   if (!h) h = c->mt = kh_init(mt, mrb);
-  k = kh_put(mt, h, name, &ret);
+  k = kh_put(mt, h, name);
   kh_value(h, k) = mrb_proc_ptr(body);
 }
 
diff --git a/src/hash.c b/src/hash.c
index 5b54eb648..b1df78a3e 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -171,7 +171,7 @@ mrb_hash_set(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value val) /* mr
   k = kh_get(ht, h, key);
   if (k == kh_end(h)) {
     /* expand */
-    k = kh_put(ht, h, KEY(key), &r);
+    k = kh_put(ht, h, KEY(key));
   }
 
   kh_value(h, k) = val;
@@ -219,7 +219,6 @@ mrb_hash_dup(mrb_state *mrb, mrb_value hash)
   struct RHash* ret;
   khash_t(ht) *h, *ret_h;
   khiter_t k, ret_k;
-  int r;
 
   ret = mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class);
   ret->ht = kh_init(ht, mrb);
@@ -230,7 +229,7 @@ mrb_hash_dup(mrb_state *mrb, mrb_value hash)
 
     for (k = kh_begin(h); k != kh_end(h); k++) {
       if (kh_exist(h,k)) {
-        ret_k = kh_put(ht, ret_h, KEY(kh_key(h,k)), &r);
+        ret_k = kh_put(ht, ret_h, KEY(kh_key(h,k)));
         kh_val(ret_h, ret_k) = kh_val(h,k);
       }
     }
@@ -615,7 +614,6 @@ mrb_hash_shift(mrb_state *mrb, mrb_value hash)
   khiter_t k;
   mrb_value delKey, delVal;
   mrb_value result;
-  int r;
 
   mrb_hash_modify(mrb, hash);
   if (h) {
@@ -627,7 +625,7 @@ mrb_hash_shift(mrb_state *mrb, mrb_value hash)
         delVal = mrb_hash_delete_key(mrb, hash, delKey);
 
         result = mrb_hash_new(mrb, 1);
-        k = kh_put(ht, RHASH_H_TBL(result), KEY(delKey), &r);
+        k = kh_put(ht, RHASH_H_TBL(result), KEY(delKey));
         kh_value(RHASH_H_TBL(result), k) = delVal;
         return result;
       }
diff --git a/src/symbol.c b/src/symbol.c
index 14721e0a2..bbc5246fe 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -32,7 +32,6 @@ mrb_intern(mrb_state *mrb, const char *name)
   khash_t(n2s) *h = mrb->name2sym;
   khash_t(s2n) *rh = mrb->sym2name;
   khiter_t k;
-  int r;
   size_t len;
   char *p;
   mrb_sym sym;
@@ -46,10 +45,10 @@ mrb_intern(mrb_state *mrb, const char *name)
   p = mrb_malloc(mrb, len+1);
   memcpy(p, name, len);
   p[len] = 0;
-  k = kh_put(n2s, h, p, &r);
+  k = kh_put(n2s, h, p);
   kh_value(h, k) = sym;
 
-  k = kh_put(s2n, rh, sym, &r);
+  k = kh_put(s2n, rh, sym);
   kh_value(rh, k) = p;
 
   return sym;
diff --git a/src/variable.c b/src/variable.c
index c34942afe..171706f13 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -114,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;
 }
 
@@ -179,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;
       }
     }
@@ -194,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;
 }