summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gc.c2
-rw-r--r--hash.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d7c3b66f2..67eb03be25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 27 15:21:17 2013 Aman Gupta <ruby@tmm1.net>
+
+ * gc.c (gc_page_sweep): Fix compile warning from last commit.
+ * hash.c (hash_aset_str): Re-use existing variable to avoid
+ unnecessary pointer dereferencing.
+
Wed Nov 27 15:12:55 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_page_sweep): disable debug print.
diff --git a/gc.c b/gc.c
index 290849479b..12ef935849 100644
--- a/gc.c
+++ b/gc.c
@@ -2745,7 +2745,7 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
if (0) fprintf(stderr, "gc_page_sweep(%d): freed?: %d, limt: %d, freed_slots: %d, empty_slots: %d, final_slots: %d\n",
(int)rb_gc_count(),
final_slots + freed_slots + empty_slots == sweep_page->limit,
- (int)sweep_page->limit, (int)freed_slots, (int)empty_slots, final_slots);
+ (int)sweep_page->limit, (int)freed_slots, (int)empty_slots, (int)final_slots);
if (heap_pages_deferred_final && !finalizing) {
rb_thread_t *th = GET_THREAD();
diff --git a/hash.c b/hash.c
index 670e7adc12..a114773259 100644
--- a/hash.c
+++ b/hash.c
@@ -1264,7 +1264,7 @@ hash_aset_str(st_data_t *key, st_data_t *val, struct update_arg *arg, int existi
if (!existing) {
VALUE str = (VALUE)*key;
if (!OBJ_FROZEN(str))
- *key = rb_fstring((VALUE)*key);
+ *key = rb_fstring(str);
}
return hash_aset(key, val, arg, existing);
}