X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=6e82b57fb845e13d1c69d837efca679928dedd12;hp=21465c732ba0075af41dce513187bae386a262ee;hb=16b695f5a7dd6200e7c1a732a763fd1b5cf20dc7;hpb=05c749e538ebc3a4f6735f62d022655cf92fc17e

diff --git a/types/struct.c b/types/struct.c
index 21465c73..6e82b57f 100644
--- a/types/struct.c
+++ b/types/struct.c
@@ -30,28 +30,21 @@ struct definition *_struct_definition_new(struct declaration *declaration,
 static
 void _struct_definition_free(struct definition *definition);
 
-void struct_copy(struct stream_pos *dest, const struct format *fdest, 
-		 struct stream_pos *src, const struct format *fsrc,
-		 struct definition *definition)
+int struct_rw(struct stream_pos *ppos, struct definition *definition)
 {
-	struct definition_struct *_struct =
+	struct definition_struct *struct_definition =
 		container_of(definition, struct definition_struct, p);
-	struct declaration_struct *struct_declaration = _struct->declaration;
 	unsigned long i;
+	int ret;
 
-	fsrc->struct_begin(src, struct_declaration);
-	fdest->struct_begin(dest, struct_declaration);
-
-	for (i = 0; i < _struct->fields->len; i++) {
-		struct field *field = &g_array_index(_struct->fields,
+	for (i = 0; i < struct_definition->fields->len; i++) {
+		struct field *field = &g_array_index(struct_definition->fields,
 						     struct field, i);
-		struct declaration *field_declaration = field->definition->declaration;
-
-		field_declaration->copy(dest, fdest, src, fsrc, field->definition);
-
+		ret = generic_rw(ppos, field->definition);
+		if (ret)
+			return ret;
 	}
-	fsrc->struct_end(src, struct_declaration);
-	fdest->struct_end(dest, struct_declaration);
+	return 0;
 }
 
 static
@@ -74,8 +67,8 @@ void _struct_declaration_free(struct declaration *declaration)
 	g_free(struct_declaration);
 }
 
-struct declaration_struct *struct_declaration_new(const char *name,
-				    struct declaration_scope *parent_scope)
+struct declaration_struct *
+	struct_declaration_new(struct declaration_scope *parent_scope)
 {
 	struct declaration_struct *struct_declaration;
 	struct declaration *declaration;
@@ -89,9 +82,7 @@ struct declaration_struct *struct_declaration_new(const char *name,
 						DEFAULT_NR_STRUCT_FIELDS);
 	struct_declaration->scope = new_declaration_scope(parent_scope);
 	declaration->id = CTF_TYPE_STRUCT;
-	declaration->name = g_quark_from_string(name);
 	declaration->alignment = 1;
-	declaration->copy = struct_copy;
 	declaration->declaration_free = _struct_declaration_free;
 	declaration->definition_new = _struct_definition_new;
 	declaration->definition_free = _struct_definition_free;
@@ -185,15 +176,24 @@ void struct_declaration_add_field(struct declaration_struct *struct_declaration,
 				       field_declaration->alignment);
 }
 
-unsigned long
-	struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
+/*
+ * struct_declaration_lookup_field_index - returns field index
+ *
+ * Returns the index of a field in a structure, or -1 if it does not
+ * exist.
+ */
+int struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
 				       GQuark field_name)
 {
-	unsigned long index;
-
-	index = (unsigned long) g_hash_table_lookup(struct_declaration->fields_by_name,
-						    (gconstpointer) (unsigned long) field_name);
-	return index;
+	gpointer index;
+	gboolean found;
+
+	found = g_hash_table_lookup_extended(struct_declaration->fields_by_name,
+				    (gconstpointer) (unsigned long) field_name,
+				    NULL, &index);
+	if (!found)
+		return -1;
+	return (int) (unsigned long) index;
 }
 
 /*
@@ -201,8 +201,10 @@ unsigned long
  */
 struct declaration_field *
 	struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration,
-					 unsigned long index)
+					 int index)
 {
+	if (index < 0)
+		return NULL;
 	return &g_array_index(struct_declaration->fields, struct declaration_field, index);
 }
 
@@ -211,7 +213,9 @@ struct declaration_field *
  */
 struct field *
 struct_definition_get_field_from_index(struct definition_struct *_struct,
-					unsigned long index)
+					int index)
 {
+	if (index < 0)
+		return NULL;
 	return &g_array_index(_struct->fields, struct field, index);
 }