X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Ffield-path.c;h=7689a6d8f842a9f7a9e51e808989a5e40dd3919d;hb=d50d46f31cc000f03601eeaf8a0806a0c183c1d0;hp=6770290c426c5236999a6dcbbdfc870b2afbc450;hpb=217cf9d33a3ffc88e6eeaf21f3d46ee00cbeb0c4;p=babeltrace.git

diff --git a/src/ctf-writer/field-path.c b/src/ctf-writer/field-path.c
index 6770290c..7689a6d8 100644
--- a/src/ctf-writer/field-path.c
+++ b/src/ctf-writer/field-path.c
@@ -1,28 +1,10 @@
 /*
- * field-path.c
- *
- * Babeltrace CTF writer - Field path
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  * Copyright 2016 Philippe Proulx <pproulx@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Babeltrace CTF writer - Field path
  */
 
 #define BT_LOG_TAG "CTF-WRITER/FIELD-PATH"
@@ -57,7 +39,6 @@ void field_path_destroy(struct bt_ctf_object *obj)
 	g_free(field_path);
 }
 
-BT_HIDDEN
 struct bt_ctf_field_path *bt_ctf_field_path_create(void)
 {
 	struct bt_ctf_field_path *field_path = NULL;
@@ -86,7 +67,6 @@ error:
 	return NULL;
 }
 
-BT_HIDDEN
 void bt_ctf_field_path_clear(struct bt_ctf_field_path *field_path)
 {
 	if (field_path->indexes->len > 0) {
@@ -95,13 +75,12 @@ void bt_ctf_field_path_clear(struct bt_ctf_field_path *field_path)
 	}
 }
 
-BT_HIDDEN
 struct bt_ctf_field_path *bt_ctf_field_path_copy(
 		struct bt_ctf_field_path *path)
 {
 	struct bt_ctf_field_path *new_path;
 
-	BT_ASSERT(path);
+	BT_ASSERT_DBG(path);
 	BT_LOGD("Copying field path: addr=%p, index-count=%u",
 		path, path->indexes->len);
 	new_path = bt_ctf_field_path_create();
@@ -168,7 +147,7 @@ int bt_ctf_field_path_get_index(const struct bt_ctf_field_path *field_path,
 		goto end;
 	}
 
-	ret = g_array_index(field_path->indexes, int, index);
+	ret = bt_g_array_index(field_path->indexes, int, index);
 
 end:
 	return ret;