Use mmap_align

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

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
index 8ce2c3fa01b9f52e7c733904ed383c1ebc589a94..07c07be6e709aeb7eccd065fe17f02fc320a8b57 100644 (file)
--- a/formats/ctf/types/integer.c
+++ b/formats/ctf/types/integer.c
@@ -22,7 +22,7 @@
 #include <babeltrace/bitfield.h>
 #include <stdint.h>
 #include <glib.h>
-#include <endian.h>
+#include <babeltrace/endian.h>
 
 /*
  * The aligned read/write functions are expected to be faster than the
@@ -223,20 +223,20 @@ int ctf_integer_read(struct stream_pos *ppos, struct definition *definition)
 
        if (!integer_declaration->signedness) {
                if (integer_declaration->byte_order == LITTLE_ENDIAN)
-                       bt_bitfield_read_le(pos->base, unsigned long,
+                       bt_bitfield_read_le(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                &integer_definition->value._unsigned);
                else
-                       bt_bitfield_read_be(pos->base, unsigned long,
+                       bt_bitfield_read_be(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                &integer_definition->value._unsigned);
        } else {
                if (integer_declaration->byte_order == LITTLE_ENDIAN)
-                       bt_bitfield_read_le(pos->base, unsigned long,
+                       bt_bitfield_read_le(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                &integer_definition->value._signed);
                else
-                       bt_bitfield_read_be(pos->base, unsigned long,
+                       bt_bitfield_read_be(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                &integer_definition->value._signed);
        }
@@ -266,20 +266,20 @@ int ctf_integer_write(struct stream_pos *ppos, struct definition *definition)
                goto end;
        if (!integer_declaration->signedness) {
                if (integer_declaration->byte_order == LITTLE_ENDIAN)
-                       bt_bitfield_write_le(pos->base, unsigned long,
+                       bt_bitfield_write_le(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                integer_definition->value._unsigned);
                else
-                       bt_bitfield_write_be(pos->base, unsigned long,
+                       bt_bitfield_write_be(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                integer_definition->value._unsigned);
        } else {
                if (integer_declaration->byte_order == LITTLE_ENDIAN)
-                       bt_bitfield_write_le(pos->base, unsigned long,
+                       bt_bitfield_write_le(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                integer_definition->value._signed);
                else
-                       bt_bitfield_write_be(pos->base, unsigned long,
+                       bt_bitfield_write_be(mmap_align_addr(pos->base_mma), unsigned long,
                                pos->offset, integer_declaration->len,
                                integer_definition->value._signed);
        }