X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-statedump.c;h=eaee338a79d5b740591f015e58bd63c81dd22434;hb=5152f6df156d6ccb234965d1b3d26b167bd6b94e;hp=ff24e7c8de2df75914fab7101aa330a2ee61ae29;hpb=bdb12629ec5577e27573886dfc229552df94a7c2;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index ff24e7c8..eaee338a 100644
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -16,7 +16,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lttng/ust-elf.h>
+#include <ust-elf.h>
 #include <ust-helper.h>
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
@@ -63,7 +63,7 @@ struct lttng_ust_dl_node {
 #define UST_DL_STATE_TABLE_SIZE	(1 << UST_DL_STATE_HASH_BITS)
 struct cds_hlist_head dl_state_table[UST_DL_STATE_TABLE_SIZE];
 
-typedef void (*tracepoint_cb)(struct lttng_session *session, void *priv);
+typedef void (*tracepoint_cb)(struct lttng_ust_session *session, void *priv);
 
 static
 struct lttng_ust_dl_node *alloc_dl_node(const struct bin_info_data *bin_data)
@@ -204,7 +204,7 @@ void trace_statedump_event(tracepoint_cb tp_cb, void *owner, void *priv)
 }
 
 static
-void trace_bin_info_cb(struct lttng_session *session, void *priv)
+void trace_bin_info_cb(struct lttng_ust_session *session, void *priv)
 {
 	struct bin_info_data *bin_data = (struct bin_info_data *) priv;
 
@@ -216,7 +216,7 @@ void trace_bin_info_cb(struct lttng_session *session, void *priv)
 }
 
 static
-void trace_build_id_cb(struct lttng_session *session, void *priv)
+void trace_build_id_cb(struct lttng_ust_session *session, void *priv)
 {
 	struct bin_info_data *bin_data = (struct bin_info_data *) priv;
 
@@ -226,7 +226,7 @@ void trace_build_id_cb(struct lttng_session *session, void *priv)
 }
 
 static
-void trace_debug_link_cb(struct lttng_session *session, void *priv)
+void trace_debug_link_cb(struct lttng_ust_session *session, void *priv)
 {
 	struct bin_info_data *bin_data = (struct bin_info_data *) priv;
 
@@ -236,20 +236,20 @@ void trace_debug_link_cb(struct lttng_session *session, void *priv)
 }
 
 static
-void procname_cb(struct lttng_session *session, void *priv)
+void procname_cb(struct lttng_ust_session *session, void *priv)
 {
 	char *procname = (char *) priv;
 	tracepoint(lttng_ust_statedump, procname, session, procname);
 }
 
 static
-void trace_start_cb(struct lttng_session *session, void *priv)
+void trace_start_cb(struct lttng_ust_session *session, void *priv __attribute__((unused)))
 {
 	tracepoint(lttng_ust_statedump, start, session);
 }
 
 static
-void trace_end_cb(struct lttng_session *session, void *priv)
+void trace_end_cb(struct lttng_ust_session *session, void *priv __attribute__((unused)))
 {
 	tracepoint(lttng_ust_statedump, end, session);
 }
@@ -444,7 +444,7 @@ end:
 }
 
 static
-int extract_bin_info_events(struct dl_phdr_info *info, size_t size, void *_data)
+int extract_bin_info_events(struct dl_phdr_info *info, size_t size __attribute__((unused)), void *_data)
 {
 	int j, ret = 0;
 	struct dl_iterate_data *data = _data;