X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.c;h=a75161f3c4dcafc97dab2c23010a7a0e850660dc;hb=4ebfe6f94bbf97a09b1d78df68a967ffdee085d0;hp=405c6e709175f8c376f7feda0ae89c36f5a82410;hpb=98d7814fdfbdbb83cc57d6d3ed758f8b8b86d244;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c
index 405c6e70..a75161f3 100644
--- a/ltt/branches/poly/lttv/lttv/state.c
+++ b/ltt/branches/poly/lttv/lttv/state.c
@@ -1213,6 +1213,8 @@ static LttvBdevState *bdevstate_new(void)
   LttvBdevState *retval;
   retval = g_malloc(sizeof(LttvBdevState));
   retval->mode_stack = g_array_new(FALSE, FALSE, sizeof(GQuark));
+
+  return retval;
 }
 
 static void bdevstate_free(LttvBdevState *bds)
@@ -1234,6 +1236,8 @@ static LttvBdevState *bdevstate_copy(LttvBdevState *bds)
 
   retval = bdevstate_new();
   g_array_insert_vals(retval->mode_stack, 0, bds->mode_stack->data, bds->mode_stack->len);
+
+  return retval;
 }
 
 static void insert_and_copy_bdev_state(gpointer k, gpointer v, gpointer u)
@@ -1437,7 +1441,7 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
   type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
   g_assert(type == LTTV_POINTER);
   lttv_state_free_blkdev_hashtable(self->bdev_states);
-  self->bdev_states = lttv_state_copy_blkdev_hashtable(self->bdev_states);
+  self->bdev_states = lttv_state_copy_blkdev_hashtable(*(value.v_pointer));
 
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfcs =