|
From: <sv...@va...> - 2012-08-29 15:21:23
|
florian 2012-08-29 16:21:15 +0100 (Wed, 29 Aug 2012)
New Revision: 12913
Log:
Fix printf formats for uint64_t values.
Modified files:
trunk/memcheck/tests/vbit-test/util.c
trunk/memcheck/tests/vbit-test/vbits.c
Modified: trunk/memcheck/tests/vbit-test/util.c (+14 -13)
===================================================================
--- trunk/memcheck/tests/vbit-test/util.c 2012-08-29 15:59:13 +01:00 (rev 12912)
+++ trunk/memcheck/tests/vbit-test/util.c 2012-08-29 16:21:15 +01:00 (rev 12913)
@@ -4,6 +4,7 @@
#include <stdlib.h> // exit
#include <assert.h> // assert
#include <endian.h>
+#include <inttypes.h>
#include "vtest.h"
@@ -47,27 +48,27 @@
case 8: fprintf(fp, "%02x", val.u8); break;
case 16: fprintf(fp, "%04x", val.u16); break;
case 32: fprintf(fp, "%08x", val.u32); break;
- case 64: fprintf(fp, "%016lx", val.u64); break;
+ case 64: fprintf(fp, "%016"PRIx64, val.u64); break;
case 128:
if (__BYTE_ORDER == __LITTLE_ENDIAN) {
- fprintf(fp, "%016lx", val.u128[1]);
- fprintf(fp, "%016lx", val.u128[0]);
+ fprintf(fp, "%016"PRIx64, val.u128[1]);
+ fprintf(fp, "%016"PRIx64, val.u128[0]);
} else {
- fprintf(fp, "%016lx", val.u128[0]);
- fprintf(fp, "%016lx", val.u128[1]);
+ fprintf(fp, "%016"PRIx64, val.u128[0]);
+ fprintf(fp, "%016"PRIx64, val.u128[1]);
}
break;
case 256:
if (__BYTE_ORDER == __LITTLE_ENDIAN) {
- fprintf(fp, "%016lx", val.u256[3]);
- fprintf(fp, "%016lx", val.u256[2]);
- fprintf(fp, "%016lx", val.u256[1]);
- fprintf(fp, "%016lx", val.u256[0]);
+ fprintf(fp, "%016"PRIx64, val.u256[3]);
+ fprintf(fp, "%016"PRIx64, val.u256[2]);
+ fprintf(fp, "%016"PRIx64, val.u256[1]);
+ fprintf(fp, "%016"PRIx64, val.u256[0]);
} else {
- fprintf(fp, "%016lx", val.u256[0]);
- fprintf(fp, "%016lx", val.u256[1]);
- fprintf(fp, "%016lx", val.u256[2]);
- fprintf(fp, "%016lx", val.u256[3]);
+ fprintf(fp, "%016"PRIx64, val.u256[0]);
+ fprintf(fp, "%016"PRIx64, val.u256[1]);
+ fprintf(fp, "%016"PRIx64, val.u256[2]);
+ fprintf(fp, "%016"PRIx64, val.u256[3]);
}
break;
default:
Modified: trunk/memcheck/tests/vbit-test/vbits.c (+14 -13)
===================================================================
--- trunk/memcheck/tests/vbit-test/vbits.c 2012-08-29 15:59:13 +01:00 (rev 12912)
+++ trunk/memcheck/tests/vbit-test/vbits.c 2012-08-29 16:21:15 +01:00 (rev 12913)
@@ -3,6 +3,7 @@
#include <stdio.h> // fprintf
#include <assert.h> // assert
#include <endian.h> // __BYTE_ORDER
+#include <inttypes.h>
#include "vbits.h"
#include "vtest.h"
@@ -34,27 +35,27 @@
case 8: fprintf(fp, "%02x", v.bits.u8); break;
case 16: fprintf(fp, "%04x", v.bits.u16); break;
case 32: fprintf(fp, "%08x", v.bits.u32); break;
- case 64: fprintf(fp, "%016lx", v.bits.u64); break;
+ case 64: fprintf(fp, "%016"PRIx64, v.bits.u64); break;
case 128:
if (__BYTE_ORDER == __LITTLE_ENDIAN) {
- fprintf(fp, "%016lx", v.bits.u128[1]);
- fprintf(fp, "%016lx", v.bits.u128[0]);
+ fprintf(fp, "%016"PRIx64, v.bits.u128[1]);
+ fprintf(fp, "%016"PRIx64, v.bits.u128[0]);
} else {
- fprintf(fp, "%016lx", v.bits.u128[0]);
- fprintf(fp, "%016lx", v.bits.u128[1]);
+ fprintf(fp, "%016"PRIx64, v.bits.u128[0]);
+ fprintf(fp, "%016"PRIx64, v.bits.u128[1]);
}
break;
case 256:
if (__BYTE_ORDER == __LITTLE_ENDIAN) {
- fprintf(fp, "%016lx", v.bits.u256[3]);
- fprintf(fp, "%016lx", v.bits.u256[2]);
- fprintf(fp, "%016lx", v.bits.u256[1]);
- fprintf(fp, "%016lx", v.bits.u256[0]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[3]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[2]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[1]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[0]);
} else {
- fprintf(fp, "%016lx", v.bits.u256[0]);
- fprintf(fp, "%016lx", v.bits.u256[1]);
- fprintf(fp, "%016lx", v.bits.u256[2]);
- fprintf(fp, "%016lx", v.bits.u256[3]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[0]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[1]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[2]);
+ fprintf(fp, "%016"PRIx64, v.bits.u256[3]);
}
break;
default:
|