Build fix
[babeltrace.git] / types / enum.c
index 354603c44176dc989d9a5b66b082d997b81ac766..015cf7fc757deaeaaefc1fb946f9d19f7b213abb 100644 (file)
@@ -1,33 +1,26 @@
 /*
- * 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>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
 #include <stdint.h>
 #include <glib.h>
 
-struct enum_table {
-       GHashTable *value_to_quark;     /* Tuples (value, GQuark) */
-       GHashTable *quark_to_value;     /* Tuples (GQuark, value) */
-};
-
 #if (__WORDSIZE == 32)
 GQuark enum_uint_to_quark(const struct type_class_enum *enum_class, uint64_t v)
 {
@@ -44,7 +37,7 @@ GQuark enum_int_to_quark(const struct type_class_enum *enum_class, uint64_t v)
 }
 
 uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class,
-                           size_t len, int byte_order, GQuark q)
+                           GQuark q)
 {
        gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
                                              (gconstpointer) q);
@@ -52,7 +45,7 @@ uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class,
 }
 
 int64_t enum_quark_to_int(const struct type_class_enum *enum_class,
-                         size_t len, int byte_order, GQuark q)
+                         GQuark q)
 {
        gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
                                              (gconstpointer) q);
@@ -83,7 +76,7 @@ void enum_signed_insert(struct type_class_enum *enum_class, int64_t v, GQuark q)
 {
        int64_t *valuep = g_new(int64_t, 1);
 
-       g_hash_table_insert(enum_class->table>value_to_quark, valuep,
+       g_hash_table_insert(enum_class->table.value_to_quark, valuep,
                            (gpointer) (unsigned long) q);
        g_hash_table_insert(enum_class->table.quark_to_value,
                            (gpointer) (unsigned long) q,
@@ -116,7 +109,7 @@ GQuark enum_int_to_quark(const struct type_class_enum *enum_class, uint64_t v)
 }
 
 uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class,
-                           size_t len, int byte_order, GQuark q)
+                           GQuark q)
 {
        gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
                                              (gconstpointer) (unsigned long) q);
@@ -124,7 +117,7 @@ uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class,
 }
 
 int64_t enum_quark_to_int(const struct type_class_enum *enum_class,
-                         size_t len, int byte_order, GQuark q)
+                         GQuark q)
 {
        gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
                                              (gconstpointer) (unsigned long) q);
@@ -166,17 +159,16 @@ void enum_unsigned_insert(struct type_class_enum *enum_class,
 }
 #endif /* __WORDSIZE != 32 */
 
-size_t enum_copy(unsigned char *dest, const struct format *fdest, 
-                const unsigned char *src, const struct format *fsrc,
-                const struct type_class *type_class)
+void enum_copy(struct stream_pos *dest, const struct format *fdest, 
+              struct stream_pos *src, const struct format *fsrc,
+              const struct type_class *type_class)
 {
        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;
+               container_of(type_class, struct type_class_enum, p.p);
+       struct type_class_integer *int_class = &enum_class->p;
        GQuark v;
 
-       v = fsrc->enum_read(src, enum_class)
+       v = fsrc->enum_read(src, enum_class);
        return fdest->enum_write(dest, enum_class, v);
 }
 
@@ -191,7 +183,7 @@ static
 void _enum_type_free(struct type_class *type_class)
 {
        struct type_class_enum *enum_class =
-               container_of(type_class, struct type_class_enum, p);
+               container_of(type_class, struct type_class_enum, p.p);
        enum_type_free(enum_class);
 }
 
@@ -200,22 +192,22 @@ struct type_class_enum *enum_type_new(const char *name,
                                      int signedness,
                                      size_t alignment)
 {
-       struct type_class_bitfield *bitfield_class;
+       struct type_class_enum *enum_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;
-       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;
        int_class->p.free = _enum_type_free;
+       int_class->p.ref = 1;
        int_class->len = len;
        int_class->byte_order = byte_order;
        int_class->signedness = signedness;
This page took 0.024812 seconds and 4 git commands to generate.