X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;h=53a9692f85b46b3c2c8baaef851fd27ac08eac6f;hp=578388d15936065a242d3a4e0b30e6be09072c2d;hb=334c0a83321f9140dec6436ed0c5cbb1af8ec895;hpb=7172902caa455601e0d7429378e898eb12bbb2ba

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 578388d1..53a9692f 100644
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -20,16 +20,63 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <ctf/ctf-types.h>
+#include <babeltrace/ctf/types.h>
+#include <limits.h>		/* C99 limits */
 #include <string.h>
 
-size_t string_copy(char *dest, const char *src)
+void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
+		     const struct type_class_string *string_class)
 {
-	size_t len = strlen(src) + 1;
+	size_t len;
+	unsigned char *destaddr, *srcaddr;
 
-	if (!dest)
+	align_pos(src, string_class->p.alignment);
+	srcaddr = get_pos_addr(src);
+	len = strlen(srcaddr) + 1;
+	if (dest->dummy)
 		goto end;
-	strcpy(dest, src);
+	align_pos(dest, string_class->p.alignment);
+	destaddr = get_pos_addr(dest);
+	strcpy(destaddr, srcaddr);
 end:
-	return len * 8;
+	move_pos(dest, len);
+	move_pos(src, len);
+}
+
+void ctf_string_read(unsigned char **dest, struct stream_pos *src,
+		     const struct type_class_string *string_class)
+{
+	size_t len;
+	unsigned char *srcaddr;
+
+	align_pos(src, string_class->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:
+	move_pos(src, len);
+}
+
+void ctf_string_write(struct stream_pos *dest, const unsigned char *src,
+		      const struct type_class_string *string_class)
+{
+	size_t len;
+	unsigned char *destaddr;
+
+	align_pos(dest, string_class->p.alignment);
+	len = strlen(src) + 1;
+	if (dest->dummy)
+		goto end;
+	destaddr = get_pos_addr(dest);
+	strcpy(destaddr, src);
+end:
+	move_pos(dest, len);
+}
+
+void ctf_string_free_temp(unsigned char *string)
+{
+	g_free(string);
 }