remove crc32.tab, which is no longer used

[lttv.git] / ltt / branches / poly / ltt / marker.c

diff --git a/ltt/branches/poly/ltt/marker.c b/ltt/branches/poly/ltt/marker.c
index 8594d03602e372705dfefa2519c212e89343981f..ce1fc86863f0f9f093820cffe8506ff7914b5200 100644 (file)
--- a/ltt/branches/poly/ltt/marker.c
+++ b/ltt/branches/poly/ltt/marker.c
@@ -409,14 +409,16 @@ int marker_format_event(LttTrace *trace, GQuark name, const char *format)
   char *fcopy;
   
   fquery = marker_get_format_from_name(trace, name);
-  if (fquery)
+  if (fquery) {
     if (strcmp(fquery, format) != 0)
       g_error("Marker format mismatch \"%s\" vs \"%s\" for marker %s. "
             "Kernel issue.", fquery, format, g_quark_to_string(name));
-
+    else
+      return 0;  /* Already exists. Nothing to do. */
+  }
   fcopy = g_new(char, strlen(format)+1);
   strcpy(fcopy, format);
-  g_hash_table_insert(trace->markers_format_hash, (gpointer)name,
+  g_hash_table_insert(trace->markers_format_hash, (gpointer)(gulong)name,
     (gpointer)fcopy);
 
   info = marker_get_info_from_name(trace, name);
@@ -454,7 +456,7 @@ int marker_id_event(LttTrace *trace, GQuark name, guint16 id,
         info->format, g_quark_to_string(name));
   head = marker_get_info_from_name(trace, name);
   if (!head)
-    g_hash_table_insert(trace->markers_hash, (gpointer)name,
+    g_hash_table_insert(trace->markers_hash, (gpointer)(gulong)name,
       (gpointer)(gulong)id);
   else {
     struct marker_info *iter;
@@ -462,7 +464,7 @@ int marker_id_event(LttTrace *trace, GQuark name, guint16 id,
       if (iter->name == name)
         found = 1;
     if (!found) {
-      g_hash_table_replace(trace->markers_hash, (gpointer)name,
+      g_hash_table_replace(trace->markers_hash, (gpointer)(gulong)name,
         (gpointer)(gulong)id);
       info->next = head;
     }