X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fdebug-info.c;h=eff5134b13e890d8f17c420aedca7fab492d0755;hb=5b44aff250d4510f7e96447ddc77f0e3ff3f1739;hp=212238640ec223d9cc29470471fe6f3efd4fc1b5;hpb=ea94a8a710d70c0ec43b65cca6926d30dcf559b7;p=babeltrace.git

diff --git a/lib/debug-info.c b/lib/debug-info.c
index 21223864..eff5134b 100644
--- a/lib/debug-info.c
+++ b/lib/debug-info.c
@@ -66,17 +66,17 @@ struct debug_info {
 static
 int debug_info_init(struct debug_info *info)
 {
-	info->q_statedump_bin_info = g_quark_from_static_string(
+	info->q_statedump_bin_info = g_quark_from_string(
 			"lttng_ust_statedump:bin_info");
-	info->q_statedump_debug_link = g_quark_from_static_string(
+	info->q_statedump_debug_link = g_quark_from_string(
 			"lttng_ust_statedump:debug_link)");
-	info->q_statedump_build_id = g_quark_from_static_string(
+	info->q_statedump_build_id = g_quark_from_string(
 			"lttng_ust_statedump:build_id");
-	info->q_statedump_start = g_quark_from_static_string(
+	info->q_statedump_start = g_quark_from_string(
 			"lttng_ust_statedump:start");
-	info->q_dl_open = g_quark_from_static_string("lttng_ust_dl:dlopen");
-	info->q_lib_load = g_quark_from_static_string("lttng_ust_lib:load");
-	info->q_lib_unload = g_quark_from_static_string("lttng_ust_lib:unload");
+	info->q_dl_open = g_quark_from_string("lttng_ust_dl:dlopen");
+	info->q_lib_load = g_quark_from_string("lttng_ust_lib:load");
+	info->q_lib_unload = g_quark_from_string("lttng_ust_lib:unload");
 
 	return bin_info_init();
 }
@@ -746,8 +746,8 @@ void handle_lib_unload_event(struct debug_info *debug_info,
 	}
 
 	key_ptr = (gpointer) &baddr;
-	assert(g_hash_table_remove(proc_dbg_info_src->baddr_to_bin_info,
-			key_ptr));
+	(void) g_hash_table_remove(proc_dbg_info_src->baddr_to_bin_info,
+			key_ptr);
 end:
 	return;
 }
@@ -863,10 +863,11 @@ void debug_info_handle_event(struct debug_info *debug_info,
 		handle_statedump_build_id_event(debug_info, event);
 	} else if (event_class->name == debug_info-> q_lib_unload) {
 		handle_lib_unload_event(debug_info, event);
-	} else {
-		/* Other events: register debug infos */
-		register_event_debug_infos(debug_info, event);
 	}
+
+	/* All events: register debug infos */
+	register_event_debug_infos(debug_info, event);
+
 end:
 	return;
 }