Rename "type" to "declaration"

[babeltrace.git] / formats / ctf / types / string.c

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index fab69c4fa8833208c2f95d5d971a7764e9029ad9..31b1d593a10eeac25698dd29224015611ff164bb 100644 (file)
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -21,17 +21,17 @@
 #include <string.h>
 
 void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
-                    const struct type_class_string *string_class)
+                    const struct declaration_string *string_declaration)
 {
        size_t len;
-       unsigned char *destaddr, *srcaddr;
+       char *destaddr, *srcaddr;
 
-       align_pos(src, string_class->p.alignment);
+       align_pos(src, string_declaration->p.alignment);
        srcaddr = get_pos_addr(src);
        len = strlen(srcaddr) + 1;
        if (dest->dummy)
                goto end;
-       align_pos(dest, string_class->p.alignment);
+       align_pos(dest, string_declaration->p.alignment);
        destaddr = get_pos_addr(dest);
        strcpy(destaddr, srcaddr);
 end:
@@ -39,28 +39,27 @@ end:
        move_pos(src, len);
 }
 
-void ctf_string_read(unsigned char **dest, struct stream_pos *src,
-                    const struct type_class_string *string_class)
+void ctf_string_read(char **dest, struct stream_pos *src,
+                    const struct declaration_string *string_declaration)
 {
        size_t len;
-       unsigned char *srcaddr;
+       char *srcaddr;
 
-       align_pos(src, string_class->p.alignment);
+       align_pos(src, string_declaration->p.alignment);
        srcaddr = get_pos_addr(src);
        len = strlen(srcaddr) + 1;
        *dest = g_realloc(*dest, len);
        strcpy(*dest, srcaddr);
-end:
        move_pos(src, len);
 }
 
-void ctf_string_write(struct stream_pos *dest, const unsigned char *src,
-                     const struct type_class_string *string_class)
+void ctf_string_write(struct stream_pos *dest, const char *src,
+                     const struct declaration_string *string_declaration)
 {
        size_t len;
-       unsigned char *destaddr;
+       char *destaddr;
 
-       align_pos(dest, string_class->p.alignment);
+       align_pos(dest, string_declaration->p.alignment);
        len = strlen(src) + 1;
        if (dest->dummy)
                goto end;
@@ -70,7 +69,7 @@ end:
        move_pos(dest, len);
 }
 
-void ctf_string_free_temp(unsigned char *string)
+void ctf_string_free_temp(char *string)
 {
        g_free(string);
 }