X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=489667a3abf8dd09c84e63c3f5c7bd0bae1d155b;hp=0fbc19187ef9e487914fd7540e07e7346fbf8145;hb=ccd7e1c86f36342b0b06651cc52df86bb663c271;hpb=90b676d73fc6f817958083c0f159028a2f0b40ca

diff --git a/types/enum.c b/types/enum.c
index 0fbc1918..489667a3 100644
--- a/types/enum.c
+++ b/types/enum.c
@@ -1,21 +1,19 @@
 /*
- * BabelTrace - Enumeration Type
+ * enum.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - Enumeration Type
  *
- * 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.
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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:
  *
- * 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/compiler.h>
@@ -172,8 +170,7 @@ size_t enum_copy(unsigned char *dest, const struct format *fdest,
 {
 	struct type_class_enum *enum_class =
 		container_of(type_class, struct type_class_enum, p);
-	struct type_class_bitfield *bitfield_class = &enum_class->p;
-	struct type_class_integer *int_class = &bitfield_class->p;
+	struct type_class_integer *int_class = &enum_class->p;
 	GQuark v;
 
 	v = fsrc->enum_read(src, enum_class)
@@ -196,24 +193,20 @@ void _enum_type_free(struct type_class *type_class)
 }
 
 struct type_class_enum *enum_type_new(const char *name,
-				      size_t start_offset,
 				      size_t len, int byte_order,
 				      int signedness,
 				      size_t alignment)
 {
-	struct type_class_bitfield *bitfield_class;
 	struct type_class_integer *int_class;
 	int ret;
 
-	enum_class = g_new(struct type_class_bitfield, 1);
-	enum_class->table.value_to_quark = g_hash_table(enum_val_hash,
-							enum_val_equal);
+	enum_class = g_new(struct type_class_enum, 1);
+	enum_class->table.value_to_quark = g_hash_table_new(enum_val_hash,
+							    enum_val_equal);
 	enum_class->table.quark_to_value = g_hash_table_new_full(g_direct_hash,
 							g_direct_equal,
 							NULL, enum_val_free);
-	bitfield_class = &enum_class->p;
-	bitfield_class->start_offset = start_offset;
-	int_class = &bitfield_class->p;
+	int_class = &enum_class->p;
 	int_class->p.name = g_quark_from_string(name);
 	int_class->p.alignment = alignment;
 	int_class->p.copy = enum_copy;
@@ -221,7 +214,6 @@ struct type_class_enum *enum_type_new(const char *name,
 	int_class->len = len;
 	int_class->byte_order = byte_order;
 	int_class->signedness = signedness;
-	bitfield_class->start_offset = start_offset;
 	if (int_class->p.name) {
 		ret = register_type(&int_class->p);
 		if (ret) {