X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;h=43decb50574bb190f3521d0a7f698427a453730d;hp=dbdcb4be8efd2161e8df6bcc42a3db2711db489c;hb=37b99bdba8478569634dd5ceecea50d1e9f9ac0a;hpb=da320b838f4deeaae4314c18c507ca486243b0fe

diff --git a/types/array.c b/types/array.c
index dbdcb4be..43decb50 100644
--- a/types/array.c
+++ b/types/array.c
@@ -16,6 +16,14 @@
  *
  * 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.
  */
 
 #include <babeltrace/compiler.h>
@@ -30,7 +38,7 @@ struct definition *_array_definition_new(struct declaration *declaration,
 static
 void _array_definition_free(struct definition *definition);
 
-int array_rw(struct stream_pos *pos, struct definition *definition)
+int bt_array_rw(struct bt_stream_pos *pos, struct definition *definition)
 {
 	struct definition_array *array_definition =
 		container_of(definition, struct definition_array, p);
@@ -56,13 +64,13 @@ void _array_declaration_free(struct declaration *declaration)
 	struct declaration_array *array_declaration =
 		container_of(declaration, struct declaration_array, p);
 
-	free_declaration_scope(array_declaration->scope);
-	declaration_unref(array_declaration->elem);
+	bt_free_declaration_scope(array_declaration->scope);
+	bt_declaration_unref(array_declaration->elem);
 	g_free(array_declaration);
 }
 
 struct declaration_array *
-	array_declaration_new(size_t len,
+	bt_array_declaration_new(size_t len,
 			      struct declaration *elem_declaration,
 			      struct declaration_scope *parent_scope)
 {
@@ -72,12 +80,11 @@ struct declaration_array *
 	array_declaration = g_new(struct declaration_array, 1);
 	declaration = &array_declaration->p;
 	array_declaration->len = len;
-	declaration_ref(elem_declaration);
+	bt_declaration_ref(elem_declaration);
 	array_declaration->elem = elem_declaration;
-	array_declaration->scope = new_declaration_scope(parent_scope);
+	array_declaration->scope = bt_new_declaration_scope(parent_scope);
 	declaration->id = CTF_TYPE_ARRAY;
-	/* No need to align the array, the first element will align itself */
-	declaration->alignment = 1;
+	declaration->alignment = elem_declaration->alignment;
 	declaration->declaration_free = _array_declaration_free;
 	declaration->definition_new = _array_definition_new;
 	declaration->definition_free = _array_definition_free;
@@ -98,7 +105,7 @@ struct definition *
 	int i;
 
 	array = g_new(struct definition_array, 1);
-	declaration_ref(&array_declaration->p);
+	bt_declaration_ref(&array_declaration->p);
 	array->p.declaration = declaration;
 	array->declaration = array_declaration;
 	array->p.ref = 1;
@@ -108,9 +115,9 @@ struct definition *
 	 */
 	array->p.index = root_name ? INT_MAX : index;
 	array->p.name = field_name;
-	array->p.path = new_definition_path(parent_scope, field_name, root_name);
-	array->p.scope = new_definition_scope(parent_scope, field_name, root_name);
-	ret = register_field_definition(field_name, &array->p,
+	array->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
+	array->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name);
+	ret = bt_register_field_definition(field_name, &array->p,
 					parent_scope);
 	assert(!ret);
 	array->string = NULL;
@@ -162,8 +169,8 @@ error:
 		field->declaration->definition_free(field);
 	}
 	(void) g_ptr_array_free(array->elems, TRUE);
-	free_definition_scope(array->p.scope);
-	declaration_unref(array->p.declaration);
+	bt_free_definition_scope(array->p.scope);
+	bt_declaration_unref(array->p.declaration);
 	g_free(array);
 	return NULL;
 }
@@ -186,19 +193,19 @@ void _array_definition_free(struct definition *definition)
 		}
 		(void) g_ptr_array_free(array->elems, TRUE);
 	}
-	free_definition_scope(array->p.scope);
-	declaration_unref(array->p.declaration);
+	bt_free_definition_scope(array->p.scope);
+	bt_declaration_unref(array->p.declaration);
 	g_free(array);
 }
 
-uint64_t array_len(struct definition_array *array)
+uint64_t bt_array_len(struct definition_array *array)
 {
 	if (!array->elems)
 		return array->string->len;
 	return array->elems->len;
 }
 
-struct definition *array_index(struct definition_array *array, uint64_t i)
+struct definition *bt_array_index(struct definition_array *array, uint64_t i)
 {
 	if (!array->elems)
 		return NULL;
@@ -207,7 +214,18 @@ struct definition *array_index(struct definition_array *array, uint64_t i)
 	return g_ptr_array_index(array->elems, i);
 }
 
-GString *get_char_array(const struct definition *field)
+int bt_get_array_len(const struct definition *field)
+{
+	struct definition_array *array_definition;
+	struct declaration_array *array_declaration;
+
+	array_definition = container_of(field, struct definition_array, p);
+	array_declaration = array_definition->declaration;
+
+	return array_declaration->len;
+}
+
+GString *bt_get_char_array(const struct definition *field)
 {
 	struct definition_array *array_definition;
 	struct declaration_array *array_declaration;