Add lttng_ust_ prefix before objd_unref

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

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index 5f51812566e52d5e2ae5a9fb96160f4ccaeb8f66..3327e10b827e4a5255bd2f1792bdc95bd74bc6fb 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;
 
@@ -264,7 +264,7 @@ int handle_message(struct sock_info *sock_info,
                if (lum->handle == LTTNG_UST_ROOT_HANDLE)
                        ret = -EPERM;
                else
-                       ret = objd_unref(lum->handle);
+                       ret = lttng_ust_objd_unref(lum->handle);
                break;
        default:
                if (ops->cmd)
@@ -349,7 +349,7 @@ void cleanup_sock_info(struct sock_info *sock_info)
                sock_info->socket = -1;
        }
        if (sock_info->root_handle != -1) {
-               ret = objd_unref(sock_info->root_handle);
+               ret = lttng_ust_objd_unref(sock_info->root_handle);
                if (ret) {
                        ERR("Error unref root handle");
                }
@@ -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();