X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;h=ac25e1adc4c5eb81bf5262110adf602e394bea67;hb=46322b331aefc5739efd841df72d1928e35050e6;hp=53a9692f85b46b3c2c8baaef851fd27ac08eac6f;hpb=a52d7f6a6dfe8c55b65eef0996b848873db39fe7;p=babeltrace.git

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 53a9692f..ac25e1ad 100644
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -3,80 +3,77 @@
  *
  * Strings read/write functions.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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:
  *
- * 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.
- *
- * 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/ctf/types.h>
 #include <limits.h>		/* C99 limits */
 #include <string.h>
 
-void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
-		     const struct type_class_string *string_class)
+void ctf_string_copy(struct stream_pos *pdest, struct stream_pos *psrc,
+		     const struct declaration_string *string_declaration)
 {
+	struct ctf_stream_pos *dest = ctf_pos(pdest);
+	struct ctf_stream_pos *src = ctf_pos(psrc);
 	size_t len;
-	unsigned char *destaddr, *srcaddr;
+	char *destaddr, *srcaddr;
 
-	align_pos(src, string_class->p.alignment);
-	srcaddr = get_pos_addr(src);
+	ctf_align_pos(src, string_declaration->p.alignment);
+	srcaddr = ctf_get_pos_addr(src);
 	len = strlen(srcaddr) + 1;
 	if (dest->dummy)
 		goto end;
-	align_pos(dest, string_class->p.alignment);
-	destaddr = get_pos_addr(dest);
+	ctf_align_pos(dest, string_declaration->p.alignment);
+	destaddr = ctf_get_pos_addr(dest);
 	strcpy(destaddr, srcaddr);
 end:
-	move_pos(dest, len);
-	move_pos(src, len);
+	ctf_move_pos(dest, len);
+	ctf_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 *psrc,
+		     const struct declaration_string *string_declaration)
 {
+	struct ctf_stream_pos *src = ctf_pos(psrc);
 	size_t len;
-	unsigned char *srcaddr;
+	char *srcaddr;
 
-	align_pos(src, string_class->p.alignment);
-	srcaddr = get_pos_addr(src);
+	ctf_align_pos(src, string_declaration->p.alignment);
+	srcaddr = ctf_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);
+	strcpy(*dest, srcaddr);
+	ctf_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 *pdest, const char *src,
+		      const struct declaration_string *string_declaration)
 {
+	struct ctf_stream_pos *dest = ctf_pos(pdest);
 	size_t len;
-	unsigned char *destaddr;
+	char *destaddr;
 
-	align_pos(dest, string_class->p.alignment);
+	ctf_align_pos(dest, string_declaration->p.alignment);
 	len = strlen(src) + 1;
 	if (dest->dummy)
 		goto end;
-	destaddr = get_pos_addr(dest);
+	destaddr = ctf_get_pos_addr(dest);
 	strcpy(destaddr, src);
 end:
-	move_pos(dest, len);
+	ctf_move_pos(dest, len);
 }
 
-void ctf_string_free_temp(unsigned char *string)
+void ctf_string_free_temp(char *string)
 {
 	g_free(string);
 }