From 10599fb9a7fbcc6d3909530846a8b474c812edc9 Mon Sep 17 00:00:00 2001
From: Yannick Brosseau <yannick.brosseau@gmail.com>
Date: Tue, 14 Aug 2012 15:21:11 -0400
Subject: [PATCH] Fix warnings and timespan_end

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
---
 lttv/lttv/traceset.c                      |  3 ++-
 lttv/modules/gui/controlflow/eventhooks.c | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c
index 7e86c5b7..61349656 100644
--- a/lttv/lttv/traceset.c
+++ b/lttv/lttv/traceset.c
@@ -609,7 +609,8 @@ TimeInterval lttv_traceset_get_time_span_real(LttvTraceset *ts)
 		ts->time_span.end_time = ltt_time_from_uint64(
 					lttv_traceset_get_timestamp_end(ts));
 #else
-		ts->time_span.end_time = lttv_traceset_get_time_span(ts).end_time;	
+		ts->time_span.end_time = ltt_time_from_uint64(
+				        lttv_traceset_get_timestamp_end(ts));	
 #endif
 	}
         return ts->time_span;
diff --git a/lttv/modules/gui/controlflow/eventhooks.c b/lttv/modules/gui/controlflow/eventhooks.c
index 70ce458d..72ea6986 100644
--- a/lttv/modules/gui/controlflow/eventhooks.c
+++ b/lttv/modules/gui/controlflow/eventhooks.c
@@ -471,8 +471,8 @@ int before_trywakeup_hook(void *hook_data, void *call_data)
 
   tfc->target_pid = target_pid_saved;
 
-  return 0;
 #endif //babel_cleanup
+  return 0;
 
 }
 
@@ -989,8 +989,8 @@ int after_schedchange_hook(void *hook_data, void *call_data)
     }
   }
 
-  return 0;
 #endif //babel_cleanup
+  return 0;
 }
 
 
@@ -1018,7 +1018,7 @@ int before_execmode_hook(void *hook_data, void *call_data)
 {
   LttvEvent *event;
   guint cpu;
-  guint pid;
+  guint pid = 0;
   LttvTraceState *ts;
   LttvProcessState *process;
   
@@ -1399,8 +1399,8 @@ int before_process_exit_hook(void *hook_data, void *call_data)
     }
   }
   
-  return 0;
 #endif //babel_cleanup
+  return 0;
 
 }
 
@@ -1583,8 +1583,8 @@ int before_process_release_hook(void *hook_data, void *call_data)
     }
   }
 
-  return 0;
 #endif //babel_cleanup
+  return 0;
 }
 
 
@@ -1719,8 +1719,8 @@ int after_process_fork_hook(void *hook_data, void *call_data)
       hashed_process_data_child->x.under_marked = FALSE;
     }
   }
-  return FALSE;
 #endif //babel_cleanup
+  return FALSE;
 }
 
 
@@ -1842,8 +1842,8 @@ int after_process_exit_hook(void *hook_data, void *call_data)
     }
   }
 
-  return FALSE;
 #endif //babel_cleanup
+  return FALSE;
 }
 
 
@@ -1925,8 +1925,8 @@ int after_fs_exec_hook(void *hook_data, void *call_data)
 
   processlist_set_name(process_list, process->name, hashed_process_data);
 
-  return 0;
 #endif //babel_cleanup
+  return 0;
 
 }
 
@@ -2008,8 +2008,8 @@ int after_user_generic_thread_brand_hook(void *hook_data, void *call_data)
 
   processlist_set_brand(process_list, process->brand, hashed_process_data);
 
-  return 0;
 #endif //babel_cleanup
+  return 0;
 }
 
 
@@ -2120,8 +2120,8 @@ int after_event_enum_process_hook(void *hook_data, void *call_data)
                            hashed_process_data_in);
     }
   }
-  return 0;
 #endif //babel_cleanup
+  return 0;
 }
 
 
@@ -2880,6 +2880,6 @@ int before_statedump_end(void *hook_data, void *call_data)
   /* Request expose (updates damages zone also) */
   drawing_request_expose(events_request, tss, evtime);
 
-  return 0;
 #endif //babel_cleanup
+  return 0;
 }
-- 
2.34.1