X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-writer%2Fserialize-internal.h;h=937082776ed8b8a3ab4bb3b95dd07c4940dbead5;hb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;hp=781a3dd7f1938425892cf2fb7325170b165e9f9b;hpb=6606e9c14a9fc2c1b3edd81cb52c5bb15f07f855;p=babeltrace.git

diff --git a/include/babeltrace/ctf-writer/serialize-internal.h b/include/babeltrace/ctf-writer/serialize-internal.h
index 781a3dd7..93708277 100644
--- a/include/babeltrace/ctf-writer/serialize-internal.h
+++ b/include/babeltrace/ctf-writer/serialize-internal.h
@@ -43,7 +43,7 @@
 
 #define PACKET_LEN_INCREMENT	(bt_common_get_page_size() * 8 * CHAR_BIT)
 
-struct bt_ctf_stream_pos {
+struct bt_stream_pos {
 	int fd;
 	int prot;		/* mmap protection */
 	int flags;		/* mmap flags */
@@ -57,17 +57,17 @@ struct bt_ctf_stream_pos {
 };
 
 BT_HIDDEN
-int bt_ctf_field_integer_write(struct bt_ctf_field_integer *field,
-		struct bt_ctf_stream_pos *pos,
-		enum bt_ctf_byte_order native_byte_order);
+int bt_field_integer_write(struct bt_field_integer *field,
+		struct bt_stream_pos *pos,
+		enum bt_byte_order native_byte_order);
 
 BT_HIDDEN
-int bt_ctf_field_floating_point_write(struct bt_ctf_field_floating_point *field,
-		struct bt_ctf_stream_pos *pos,
-		enum bt_ctf_byte_order native_byte_order);
+int bt_field_floating_point_write(struct bt_field_floating_point *field,
+		struct bt_stream_pos *pos,
+		enum bt_byte_order native_byte_order);
 
 static inline
-int bt_ctf_stream_pos_access_ok(struct bt_ctf_stream_pos *pos, uint64_t bit_len)
+int bt_stream_pos_access_ok(struct bt_stream_pos *pos, uint64_t bit_len)
 {
 	uint64_t max_len;
 
@@ -93,11 +93,11 @@ int bt_ctf_stream_pos_access_ok(struct bt_ctf_stream_pos *pos, uint64_t bit_len)
 }
 
 static inline
-int bt_ctf_stream_pos_move(struct bt_ctf_stream_pos *pos, uint64_t bit_offset)
+int bt_stream_pos_move(struct bt_stream_pos *pos, uint64_t bit_offset)
 {
 	int ret = 0;
 
-	ret = bt_ctf_stream_pos_access_ok(pos, bit_offset);
+	ret = bt_stream_pos_access_ok(pos, bit_offset);
 	if (!ret) {
 		goto end;
 	}
@@ -107,14 +107,14 @@ end:
 }
 
 static inline
-int bt_ctf_stream_pos_align(struct bt_ctf_stream_pos *pos, uint64_t bit_offset)
+int bt_stream_pos_align(struct bt_stream_pos *pos, uint64_t bit_offset)
 {
-	return bt_ctf_stream_pos_move(pos,
+	return bt_stream_pos_move(pos,
 		offset_align(pos->offset, bit_offset));
 }
 
 static inline
-char *bt_ctf_stream_pos_get_addr(struct bt_ctf_stream_pos *pos)
+char *bt_stream_pos_get_addr(struct bt_stream_pos *pos)
 {
 	/* Only makes sense to get the address after aligning on CHAR_BIT */
 	assert(!(pos->offset % CHAR_BIT));
@@ -123,7 +123,7 @@ char *bt_ctf_stream_pos_get_addr(struct bt_ctf_stream_pos *pos)
 }
 
 static inline
-int bt_ctf_stream_pos_init(struct bt_ctf_stream_pos *pos,
+int bt_stream_pos_init(struct bt_stream_pos *pos,
 		int fd, int open_flags)
 {
 	pos->fd = fd;
@@ -145,7 +145,7 @@ int bt_ctf_stream_pos_init(struct bt_ctf_stream_pos *pos,
 }
 
 static inline
-int bt_ctf_stream_pos_fini(struct bt_ctf_stream_pos *pos)
+int bt_stream_pos_fini(struct bt_stream_pos *pos)
 {
 	if (pos->base_mma) {
 		int ret;
@@ -161,7 +161,7 @@ int bt_ctf_stream_pos_fini(struct bt_ctf_stream_pos *pos)
 }
 
 BT_HIDDEN
-void bt_ctf_stream_pos_packet_seek(struct bt_ctf_stream_pos *pos, size_t index,
+void bt_stream_pos_packet_seek(struct bt_stream_pos *pos, size_t index,
 	int whence);
 
 #endif /* BABELTRACE_CTF_WRITER_SERIALIZE_INTERNAL_H */