Add missing permission notice in each source file

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

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
index 719823b9ff23675aab3a0f1b787ddeb8f0af25f2..66036ae2511004fafe8bd3056cb848949f11a209 100644 (file)
--- a/formats/ctf/types/integer.c
+++ b/formats/ctf/types/integer.c
@@ -16,13 +16,21 @@
  *
  * 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.
  */
 
 #include <babeltrace/ctf/types.h>
 #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
@@ -103,7 +111,7 @@ int _aligned_integer_read(struct stream_pos *ppos,
 
                        v = *(const int16_t *) ctf_get_pos_addr(pos);
                        integer_definition->value._signed =
-                               rbo ? GUINT16_SWAP_LE_BE(v) : v;
+                               rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v;
                        break;
                }
                case 32:
@@ -112,7 +120,7 @@ int _aligned_integer_read(struct stream_pos *ppos,
 
                        v = *(const int32_t *) ctf_get_pos_addr(pos);
                        integer_definition->value._signed =
-                               rbo ? GUINT32_SWAP_LE_BE(v) : v;
+                               rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v;
                        break;
                }
                case 64:
@@ -121,7 +129,7 @@ int _aligned_integer_read(struct stream_pos *ppos,
 
                        v = *(const int64_t *) ctf_get_pos_addr(pos);
                        integer_definition->value._signed =
-                               rbo ? GUINT64_SWAP_LE_BE(v) : v;
+                               rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v;
                        break;
                }
                default:
@@ -182,12 +190,12 @@ int _aligned_integer_write(struct stream_pos *ppos,
                        break;
                case 16:
                        *(int16_t *) ctf_get_pos_addr(pos) = rbo ?
-                                                GUINT16_SWAP_LE_BE((int16_t) v) :
+                                                (int16_t) GUINT16_SWAP_LE_BE((int16_t) v) :
                                                 (int16_t) v;
                        break;
                case 32:
                        *(int32_t *) ctf_get_pos_addr(pos) = rbo ?
-                                                GUINT32_SWAP_LE_BE((int32_t) v) :
+                                                (int32_t) GUINT32_SWAP_LE_BE((int32_t) v) :
                                                 (int32_t) v;
                        break;
                case 64:
@@ -223,20 +231,24 @@ 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) +
+                                       pos->mmap_base_offset, 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) +
+                                       pos->mmap_base_offset, 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) +
+                                       pos->mmap_base_offset, 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) +
+                                       pos->mmap_base_offset, unsigned long,
                                pos->offset, integer_declaration->len,
                                &integer_definition->value._signed);
        }
@@ -266,20 +278,24 @@ 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) +
+                                       pos->mmap_base_offset, 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) +
+                                       pos->mmap_base_offset, 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) +
+                                       pos->mmap_base_offset, 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) +
+                                       pos->mmap_base_offset, unsigned long,
                                pos->offset, integer_declaration->len,
                                integer_definition->value._signed);
        }