From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Thu, 22 Sep 2005 18:37:42 +0000 (+0000)
Subject: first fixes gcc 4.0
X-Git-Tag: v0.12.20~2232
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=22b165e90c22eacd205d26122686d55b866bb9d5;p=lttv.git

first fixes gcc 4.0

git-svn-id: http://ltt.polymtl.ca/svn@1257 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c
index 52815dd9..d5d54031 100644
--- a/ltt/branches/poly/lttv/lttv/state.c
+++ b/ltt/branches/poly/lttv/lttv/state.c
@@ -1866,7 +1866,7 @@ void lttv_state_save_remove_event_hooks(LttvTracesetState *self)
     ts = (LttvTraceState *)self->parent.traces[i];
     nb_tracefile = ts->parent.tracefiles->len;
 
-    guint *event_count;
+    guint *event_count = NULL;
 
     for(j = 0 ; j < nb_tracefile ; j++) {
       tfs = 
@@ -1875,7 +1875,7 @@ void lttv_state_save_remove_event_hooks(LttvTracesetState *self)
       event_count = lttv_hooks_remove(tfs->parent.event,
                         state_save_event_hook);
     }
-    g_free(event_count);
+    if(event_count) g_free(event_count);
   }
 }
 
diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c
index abee8199..6416e300 100644
--- a/ltt/branches/poly/lttv/lttv/stats.c
+++ b/ltt/branches/poly/lttv/lttv/stats.c
@@ -47,9 +47,7 @@ GQuark
   LTTV_STATS_USE_COUNT,
   LTTV_STATS,
   LTTV_STATS_TRACEFILES,
-  LTTV_STATS_SUMMED;
-
-static GQuark
+  LTTV_STATS_SUMMED,
   LTTV_STATS_BEFORE_HOOKS,
   LTTV_STATS_AFTER_HOOKS;