Fix 64-bit warnings

[babeltrace.git] / types / string.c

diff --git a/types/string.c b/types/string.c
index 4d57914112fe3a7aceeed0abda1621168e8d22f5..ab0ec72c30da53209355a229bf35aaefbd60867e 100644 (file)
--- a/types/string.c
+++ b/types/string.c
@@ -18,7 +18,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
 
 void string_copy(struct stream_pos *dest, const struct format *fdest, 
                 struct stream_pos *src, const struct format *fsrc,
@@ -30,7 +30,7 @@ void string_copy(struct stream_pos *dest, const struct format *fdest,
        if (fsrc->string_copy == fdest->string_copy) {
                fsrc->string_copy(dest, src, string_class);
        } else {
-               unsigned char *tmp = NULL;
+               char *tmp = NULL;
 
                fsrc->string_read(&tmp, src, string_class);
                fdest->string_write(dest, tmp, string_class);
@@ -60,8 +60,9 @@ struct type_class_string *string_type_new(const char *name)
        string_class->p.alignment = CHAR_BIT;
        string_class->p.copy = string_copy;
        string_class->p.free = _string_type_free;
+       string_class->p.ref = 1;
        if (string_class->p.name) {
-               ret = ctf_register_type(&string_class->p);
+               ret = register_type(&string_class->p);
                if (ret) {
                        g_free(string_class);
                        return NULL;