X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctfser%2Fctfser.h;h=2abe65a3ae18c2c265266d4c7ea4ba336cc85456;hb=443dc632d44324c54e2ddcf176342bddfd14e6b0;hp=5338353cde8deb62a31c1e68c4b473f254c5c75e;hpb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;p=babeltrace.git

diff --git a/src/ctfser/ctfser.h b/src/ctfser/ctfser.h
index 5338353c..2abe65a3 100644
--- a/src/ctfser/ctfser.h
+++ b/src/ctfser/ctfser.h
@@ -1,33 +1,18 @@
-#ifndef BABELTRACE_CTFSER_INTERNAL_H
-#define BABELTRACE_CTFSER_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  * Copyright 2017-2019 Philippe Proulx <pproulx@efficios.com>
  *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
  * The Common Trace Format (CTF) Specification is available at
  * http://www.efficios.com/ctf
  */
 
+#ifndef BABELTRACE_CTFSER_INTERNAL_H
+#define BABELTRACE_CTFSER_INTERNAL_H
+
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <limits.h>
@@ -68,7 +53,7 @@ struct bt_ctfser {
 	uint64_t stream_size_bytes;
 
 	/* Memory map base address */
-	struct mmap_align *base_mma;
+	struct mmap_align_data *base_mma;
 
 	/* Stream file's path (for debugging) */
 	GString *path;
@@ -179,7 +164,7 @@ int bt_ctfser_align_offset_in_current_packet(struct bt_ctfser *ctfser,
 	uint64_t align_size_bits;
 
 	BT_ASSERT_DBG(alignment_bits > 0);
-	align_size_bits = ALIGN(ctfser->offset_in_cur_packet_bits,
+	align_size_bits = BT_ALIGN(ctfser->offset_in_cur_packet_bits,
 			alignment_bits) - ctfser->offset_in_cur_packet_bits;
 
 	if (G_UNLIKELY(!_bt_ctfser_has_space_left(ctfser, align_size_bits))) {
@@ -250,7 +235,7 @@ int _bt_ctfser_write_byte_aligned_unsigned_int_no_align(
 		break;
 	}
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	_bt_ctfser_incr_offset(ctfser, size_bits);
@@ -312,7 +297,7 @@ int _bt_ctfser_write_byte_aligned_signed_int_no_align(
 		break;
 	}
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	_bt_ctfser_incr_offset(ctfser, size_bits);