X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;h=31b1d593a10eeac25698dd29224015611ff164bb;hp=2e6a25ec005d433713ec89cfcef6d19cd435502d;hb=f66259163f060ada8d0fee348857c968e338ea40;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 2e6a25ec..31b1d593 100644
--- 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,30 +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;
-	if (dest->dummy)
-		goto end;
 	*dest = g_realloc(*dest, len);
-	strcpy(dest, srcaddr);
-end:
+	strcpy(*dest, srcaddr);
 	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;
@@ -72,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);
 }