X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=bbbf4b3e0145da9e8c80d84b6e54db900de4cbfc;hp=b338a5913971f86f7787c6a9d4d3a2db4b6778e9;hb=4c8bfb7e0a9cef6e74cefa38ed54bf8cbd424183;hpb=0a46062b3916eda6f871b5d80c4b97dcb3804d37

diff --git a/types/integer.c b/types/integer.c
index b338a591..bbbf4b3e 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -1,54 +1,59 @@
 /*
- * BabelTrace - Integer Type Converter
+ * integer.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - Integer Type Converter
  *
- * 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/align.h>
+#include <babeltrace/format.h>
 #include <stdint.h>
 
-size_t integer_copy(unsigned char *dest, const struct format *fdest, 
-		    const unsigned char *src, const struct format *fsrc,
-		    const struct type_class *type_class)
+void integer_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_integer *int_class =
 		container_of(type_class, struct type_class_integer, p);
 
-	if (fsrc->p.alignment)
-		src = PTR_ALIGN(src, fsrc->p.alignment / CHAR_BIT);
-	if (fdest->p.alignment)
-		dest = PTR_ALIGN(dest, fdest->p.alignment / CHAR_BIT);
-
 	if (!int_class->signedness) {
 		uint64_t v;
 
-		v = fsrc->uint_read(src, int_class->len, int_class->byte_order);
-		return fdest->uint_write(dest, int_class->len, int_class->byte_order, v);
+		v = fsrc->uint_read(src, int_class);
+		fdest->uint_write(dest, int_class, v);
 	} else {
 		int64_t v;
 
-		v = fsrc->int_read(src, int_class->len, int_class->byte_order);
-		return fdest->int_write(dest, int_class->len, int_class->byte_order, v);
+		v = fsrc->int_read(src, int_class);
+		fdest->int_write(dest, int_class, v);
 	}
 }
 
+void integer_type_free(struct type_class_integer *int_class)
+{
+	g_free(int_class);
+}
+
+static void _integer_type_free(struct type_class *type_class)
+{
+	struct type_class_integer *int_class =
+		container_of(type_class, struct type_class_integer, p);
+	integer_type_free(int_class);
+}
+
 struct type_class_integer *integer_type_new(const char *name,
-					    size_t start_offset,
 					    size_t len, int byte_order,
 					    int signedness,
 					    size_t alignment)
@@ -56,18 +61,17 @@ struct type_class_integer *integer_type_new(const char *name,
 	struct type_class_integer *int_class;
 	int ret;
 
-	/*
-	 * Freed when type is unregistered.
-	 */
 	int_class = g_new(struct type_class_integer, 1);
 	int_class->p.name = g_quark_from_string(name);
 	int_class->p.alignment = alignment;
 	int_class->p.copy = integer_copy;
+	int_class->p.free = _integer_type_free;
+	int_class->p.ref = 1;
 	int_class->len = len;
 	int_class->byte_order = byte_order;
 	int_class->signedness = signedness;
 	if (int_class->p.name) {
-		ret = ctf_register_type(&int_class.p);
+		ret = ctf_register_type(&int_class->p);
 		if (ret) {
 			g_free(int_class);
 			return NULL;
@@ -75,9 +79,3 @@ struct type_class_integer *integer_type_new(const char *name,
 	}
 	return int_class;
 }
-
-void integer_type_free(struct type_class_integer *int_class)
-{
-	if (!int_class->name)
-		g_free(int_class);
-}