X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Ftracecontext.c;h=0166e9e34c7d02344ad5f4fe32aaeeb4091cd635;hb=8f31828398b8a4fcdb679324291132f4f0e3dce6;hp=939ed6f27e6c716d8e84bd84e933d24a75d15749;hpb=f61f4dca50e13aa52b1ca3941c8f420848f4353f;p=lttv.git

diff --git a/lttv/lttv/tracecontext.c b/lttv/lttv/tracecontext.c
index 939ed6f2..0166e9e3 100644
--- a/lttv/lttv/tracecontext.c
+++ b/lttv/lttv/tracecontext.c
@@ -101,7 +101,7 @@ lttv_context_new_tracefile_context(LttvTracesetContext *self)
 /****************************************************************************
  * lttv_traceset_context_compute_time_span
  *
- * Keep the time span is sync with on the fly addition and removal of traces
+ * Keep the time span in sync with on the fly addition and removal of traces
  * in a trace set. It must be called each time a trace is added/removed from
  * the traceset. It could be more efficient to call it only once a bunch
  * of traces are loaded, but the calculation is not long, so it's not
@@ -1153,7 +1153,7 @@ void lttv_traceset_context_position_copy(LttvTracesetContextPosition *dest,
   int i;
   LttvTracefileContextPosition *src_tfcp, *dest_tfcp;
   
-  g_assert(src->tfcp->len == src->tfcp->len);
+  g_assert(src->tfcp->len == dest->tfcp->len);
   
   for(i=0;i<src->tfcp->len;i++) {
     src_tfcp = 
@@ -1287,7 +1287,10 @@ LttvTracefileContext *lttv_traceset_context_get_current_tfc(LttvTracesetContext
  */
 void lttv_process_traceset_synchronize_tracefiles(LttvTracesetContext *tsc)
 {
-  g_assert(lttv_process_traceset_seek_position(tsc, tsc->sync_position) == 0);
+  int retval;
+
+  retval= lttv_process_traceset_seek_position(tsc, tsc->sync_position);
+  g_assert_cmpint(retval, ==, 0);
 }
 
 
@@ -1414,6 +1417,7 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self,
   LttTime time_offset;
   struct seek_back_data sd;
   LttvHooks *hooks = lttv_hooks_new();
+  int retval;
   
   sd.first_event = 0;
   sd.events_found = 0;
@@ -1506,11 +1510,13 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self,
     LttvTracesetContextPosition *pos =
       (LttvTracesetContextPosition*)g_ptr_array_index (sd.array,
                                                        sd.first_event);
-    g_assert(lttv_process_traceset_seek_position(self, pos) == 0);
+    retval= lttv_process_traceset_seek_position(self, pos);
+    g_assert_cmpint(retval, ==, 0);
   } else {
     /* Will seek to the last saved position : in the worst case, it will be the
      * original position (if events_found is 0) */
-    g_assert(lttv_process_traceset_seek_position(self, saved_pos) == 0);
+    retval= lttv_process_traceset_seek_position(self, saved_pos);
+    g_assert_cmpint(retval, ==, 0);
   }
   
   for(i=0;i<sd.array->len;i++) {