summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/lib/src/trace.c2
-rw-r--r--cesar/lib/test/trace/src/test_trace.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/cesar/lib/src/trace.c b/cesar/lib/src/trace.c
index a5cbbea1b4..5992a4428c 100644
--- a/cesar/lib/src/trace.c
+++ b/cesar/lib/src/trace.c
@@ -404,7 +404,7 @@ trace_buffer_dump_event (char *text, char *text_end,
}
else if (format_size == 2)
{
- u64 arg = (u64) parg[1] << 32 | parg[0];
+ u64 arg = (u64) parg[1] << 32 | (u32) parg[0];
ret = namespace->formats[*fp - 'A'].callback.format_u64 (
p, text_end - p, arg);
}
diff --git a/cesar/lib/test/trace/src/test_trace.c b/cesar/lib/test/trace/src/test_trace.c
index 8543e4152c..8ec3f59841 100644
--- a/cesar/lib/test/trace/src/test_trace.c
+++ b/cesar/lib/test/trace/src/test_trace.c
@@ -321,6 +321,9 @@ trace_basic_test_case (test_t t)
TEST_TRACE_TRACE (FOUR, TRACE_U64 (0xbc9a78563412LL), i);
growing_sprintf (&expected_dump,
"[.] four 12:34:56:78:9a:bc, %d\n", i);
+ TEST_TRACE_TRACE (FOUR, TRACE_U64 (0xbc9a87563412LL), i);
+ growing_sprintf (&expected_dump,
+ "[.] four 12:34:56:87:9a:bc, %d\n", i);
TEST_TRACE_TRACE (FIVE, i + 1, i + 2, i + 3, i);
growing_sprintf (&expected_dump,
"[.] five (%d-%d-%d), %d\n", i + 1, i + 2, i + 3,