Add lttng_ust prefix before struct obj and struct objd_ops

[lttng-ust.git] / libust / lttng-ust-comm.c

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index ba60053627ace1c0bbf01737890272f4b90178ba..3ab7ca7c2b69341b13b8f2a0b69244c92220379f 100644 (file)
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -234,7 +234,7 @@ int handle_message(struct sock_info *sock_info,
                int sock, struct ustcomm_ust_msg *lum)
 {
        int ret = 0;
-       const struct objd_ops *ops;
+       const struct lttng_ust_objd_ops *ops;
        struct ustcomm_ust_reply lur;
        int shm_fd, wait_fd;
 
@@ -556,7 +556,7 @@ void wait_for_sessiond(struct sock_info *sock_info)
                if (ret < 0) {
                        if (errno == EFAULT) {
                                wait_poll_fallback = 1;
-                               ERR(
+                               WARN(
 "Linux kernels 2.6.33 to 3.0 (with the exception of stable versions) "
 "do not support FUTEX_WAKE on read-only memory mappings correctly. "
 "Please upgrade your kernel "
@@ -819,7 +819,7 @@ void lttng_ust_cleanup(int exiting)
                cleanup_sock_info(&local_apps);
        }
        lttng_ust_abi_exit();
-       ltt_events_exit();
+       lttng_ust_events_exit();
        ltt_ring_buffer_client_discard_exit();
        ltt_ring_buffer_client_overwrite_exit();
        ltt_ring_buffer_metadata_client_exit();