Add lttng_ust_ prefix before objd_unref

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/ust/lttng-ust-abi.h b/include/ust/lttng-ust-abi.h
index 9c2a53dc2b2a69dcf6741b9b67f1bc5f6b853f46..d2b3340fa87e497dc0b87b4bbad354d590273629 100644 (file)
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -150,7 +150,7 @@ struct lttng_ust_objd_ops {
 int lttng_abi_create_root_handle(void);
 
 const struct lttng_ust_objd_ops *objd_ops(int id);
-int objd_unref(int id);
+int lttng_ust_objd_unref(int id);
 
 void lttng_ust_abi_exit(void);
 void lttng_ust_events_exit(void);

diff --git a/libust/lttng-ust-abi.c b/libust/lttng-ust-abi.c
index bb2a943783bb83b7d437e7644aab63b2309ddaac..ccfac129742903fce66a9a0a41a5eb2e9e8bba92 100644 (file)
--- a/libust/lttng-ust-abi.c
+++ b/libust/lttng-ust-abi.c
@@ -152,7 +152,7 @@ void objd_ref(int id)
        obj->u.s.f_count++;
 }
 
-int objd_unref(int id)
+int lttng_ust_objd_unref(int id)
 {
        struct lttng_ust_obj *obj = _objd_get(id);
 
@@ -178,7 +178,7 @@ void objd_table_destroy(void)
        int i;
 
        for (i = 0; i < objd_table.allocated_len; i++)
-               (void) objd_unref(i);
+               (void) lttng_ust_objd_unref(i);
        free(objd_table.array);
        objd_table.array = NULL;
        objd_table.len = 0;
@@ -429,7 +429,7 @@ chan_error:
        {
                int err;
 
-               err = objd_unref(chan_objd);
+               err = lttng_ust_objd_unref(chan_objd);
                assert(!err);
        }
 objd_error:
@@ -579,7 +579,7 @@ event_error:
        {
                int err;
 
-               err = objd_unref(event_objd);
+               err = lttng_ust_objd_unref(event_objd);
                assert(!err);
        }
 objd_error:
@@ -709,7 +709,7 @@ int lttng_channel_release(int objd)
        struct ltt_channel *channel = objd_private(objd);
 
        if (channel)
-               return objd_unref(channel->session->objd);
+               return lttng_ust_objd_unref(channel->session->objd);
        return 0;
 }
 
@@ -756,7 +756,7 @@ int lttng_rb_release(int objd)
                free(priv);
                channel->ops->buffer_read_close(buf, channel->handle);
 
-               return objd_unref(channel->objd);
+               return lttng_ust_objd_unref(channel->objd);
        }
        return 0;
 }
@@ -806,7 +806,7 @@ int lttng_event_release(int objd)
        struct ltt_event *event = objd_private(objd);
 
        if (event)
-               return objd_unref(event->chan->objd);
+               return lttng_ust_objd_unref(event->chan->objd);
        return 0;
 }
 

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index 3ab7ca7c2b69341b13b8f2a0b69244c92220379f..3327e10b827e4a5255bd2f1792bdc95bd74bc6fb 100644 (file)
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -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");
                }