X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fenum.c;h=6243345140d1b5b196278daf80f3a3d447857d87;hp=a209b47d0cdc1f169ce71b544a339bf98f7a8965;hb=c054553dac076f91196b372fa19efaf2adc4e4f9;hpb=bed864a75d2315c344a6e625db66ae9bfbc51e27

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index a209b47d..62433451 100644
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -3,62 +3,62 @@
  *
  * Enumeration mapping strings (quarks) from/to integers.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * 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:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <babeltrace/ctf/types.h>
 #include <stdint.h>
 #include <glib.h>
 
-GQuark ctf_enum_read(struct stream_pos *pos,
-		     const struct type_class_enum *src)
+/*
+ * The caller should unref the GArray.
+ */
+GArray *ctf_enum_read(struct stream_pos *pos,
+		      const struct type_class_enum *src)
 {
-	struct type_class_bitfield *bitfield_class = &src->p;
-	struct type_class_integer *int_class = &bitfield_class->p;
+	const struct type_class_integer *int_class = &src->p;
 
 	if (!int_class->signedness) {
 		uint64_t v;
 
-		v = ctf_bitfield_unsigned_read(pos, bitfield_class);
-		return enum_uint_to_quark(src, v);
+		v = ctf_uint_read(pos, int_class);
+		return enum_uint_to_quark_set(src, v);
 	} else {
 		int64_t v;
 
-		v = fsrc->bitfield_signed_read(pos, bitfield_class);
-		return enum_int_to_quark(src, v);
+		v = ctf_int_read(pos, int_class);
+		return enum_int_to_quark_set(src, v);
 	}
 }
 
-size_t ctf_enum_write(struct stream_pos *pos,
-		      const struct type_class_enum *dest,
-		      GQuark q)
+/*
+ * Arbitrarily choose the start of the first matching range.
+ */
+void ctf_enum_write(struct stream_pos *pos,
+		    const struct type_class_enum *dest,
+		    GQuark q)
 {
-	struct type_class_bitfield *bitfield_class = &dest->p;
-	struct type_class_integer *int_class = &bitfield_class->p;
+	const struct type_class_integer *int_class = &dest->p;
+	GArray *array;
 
-	if (!int_class->signedness) {
-		uint64_t v;
+	array = enum_quark_to_range_set(dest, q);
+	assert(array);
 
-		v = enum_quark_to_uint(dest, q);
-		return ctf_bitfield_unsigned_write(pos, bitfield_class, v);
+	if (!int_class->signedness) {
+		uint64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
+		ctf_uint_write(pos, int_class, v);
 	} else {
-		int64_t v;
-
-		v = enum_quark_to_int(dest, q);
-		return ctf_bitfield_signed_write(pos, bitfield_class, v);
+		int64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
+		ctf_int_write(pos, int_class, v);
 	}
 }