Return pointer when using bt_get()

bt_get() now returns the pointer it was passed to replace code
of the form:

bt_get(my_thingy);
another_object->thingy = my_thingy;

to the shorter form

another_object->thingy = bt_get(my_thingy);

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/babeltrace/ref.h b/include/babeltrace/ref.h
index a667f6f28330023cca59fdc7d7b7a6eb0a51011b..f03f8c9b01f67c9494c8bbf6476a2a84f2e1159f 100644 (file)
--- a/include/babeltrace/ref.h
+++ b/include/babeltrace/ref.h
@@ -71,8 +71,10 @@
  * It is safe to call this function with a NULL object.
  *
  * @param obj Babeltrace object.
+ *
+ * Returns obj.
  */
-void bt_get(void *obj);
+void *bt_get(void *obj);
 
 /*
  * bt_put: decrements the reference count of a Babeltrace object.

diff --git a/lib/ref.c b/lib/ref.c
index 0ac1014c626a47940d78d1da8a5d6f6c53f88194..e642e266de87543c24f9f3819e6c8b7a577c1b46 100644 (file)
--- a/lib/ref.c
+++ b/lib/ref.c
@@ -27,13 +27,14 @@
 #include <babeltrace/ref-internal.h>
 #include <babeltrace/object-internal.h>
 
-void bt_get(void *obj)
+void *bt_get(void *obj)
 {
        if (obj) {
                struct bt_object *base = obj;
 
                bt_ref_get(&base->ref_count);
        }
+       return obj;
 }
 
 void bt_put(void *obj)