X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-writer%2Ffield-path.c;h=eb6c0353bcd69a07530d2be1b8ac35be5fca46bc;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=24ef9efc0744e870a6d745502506e44d1a03f997;hpb=16ca5ff0568c72f5600ebc88b195fbc5ee88556d;p=babeltrace.git

diff --git a/lib/ctf-writer/field-path.c b/lib/ctf-writer/field-path.c
index 24ef9efc..eb6c0353 100644
--- a/lib/ctf-writer/field-path.c
+++ b/lib/ctf-writer/field-path.c
@@ -26,19 +26,19 @@
  */
 
 #define BT_LOG_TAG "CTF-WRITER-FIELD-PATH"
-#include <babeltrace/lib-logging-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
 
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/ctf-writer/field-path-internal.h>
-#include <babeltrace/ctf-writer/field-types-internal.h>
-#include <babeltrace/ctf-writer/field-types.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/ctf-writer/field-path-internal.h>
+#include <babeltrace2/ctf-writer/field-types-internal.h>
+#include <babeltrace2/ctf-writer/field-types.h>
 #include <glib.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdint.h>
 
 static
-void field_path_destroy(struct bt_object *obj)
+void field_path_destroy(struct bt_ctf_object *obj)
 {
 	struct bt_ctf_field_path *field_path = (struct bt_ctf_field_path *) obj;
 
@@ -67,7 +67,7 @@ struct bt_ctf_field_path *bt_ctf_field_path_create(void)
 		goto error;
 	}
 
-	bt_object_init_shared(&field_path->base, field_path_destroy);
+	bt_ctf_object_init_shared(&field_path->base, field_path_destroy);
 	field_path->root = BT_CTF_SCOPE_UNKNOWN;
 	field_path->indexes = g_array_new(TRUE, FALSE, sizeof(int));
 	if (!field_path->indexes) {
@@ -79,7 +79,7 @@ struct bt_ctf_field_path *bt_ctf_field_path_create(void)
 	return field_path;
 
 error:
-	BT_PUT(field_path);
+	BT_CTF_OBJECT_PUT_REF_AND_RESET(field_path);
 	return NULL;
 }