X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fvariant.c;h=faf70dde200e6bbff757ecc889e1132e5dca5cde;hp=35e00c192d3fd353de7127f41a1721f42487f32d;hb=f133896d405417ba90ac250d243d4b8e539e98f1;hpb=a35173fe7e72fe456cbd19db34a5ff7a09a0c7ff

diff --git a/types/variant.c b/types/variant.c
index 35e00c19..faf70dde 100644
--- a/types/variant.c
+++ b/types/variant.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Variant Type Converter
  *
- * Copyright 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@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
@@ -18,6 +20,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <errno.h>
 
 static
@@ -100,6 +103,7 @@ struct declaration_variant *
 	variant_declaration = g_new(struct declaration_variant, 1);
 	declaration = &variant_declaration->p;
 	variant_declaration->untagged_variant = untagged_variant;
+	declaration_ref(&untagged_variant->p);
 	variant_declaration->tag_name = g_array_new(FALSE, TRUE, sizeof(GQuark));
 	append_scope_path(tag, variant_declaration->tag_name);
 	declaration->id = CTF_TYPE_VARIANT;
@@ -270,11 +274,18 @@ void untagged_variant_declaration_add_field(struct declaration_untagged_variant
 struct declaration_field *
 untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration, GQuark tag)
 {
-	unsigned long index;
+	gpointer index;
+	gboolean found;
 
-	index = (unsigned long) g_hash_table_lookup(untagged_variant_declaration->fields_by_tag,
-						    (gconstpointer) (unsigned long) tag);
-	return &g_array_index(untagged_variant_declaration->fields, struct declaration_field, index);
+	found = g_hash_table_lookup_extended(
+				untagged_variant_declaration->fields_by_tag,
+				(gconstpointer) (unsigned long) tag, NULL, &index);
+
+	if (!found) {
+		return NULL;
+	}
+
+	return &g_array_index(untagged_variant_declaration->fields, struct declaration_field, (unsigned long)index);
 }
 
 /*