organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-3499 Fix and test %p for pointers.

Browse source 
X-SVN-Rev: 14843
This commit is contained in:
George Rhoten 2004-04-02 08:10:24 +00:00
parent ddec332bdd
commit 72265d2950
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/extra/ustdio/uprntf_p.c
View file

@ -533,11 +533,15 @@ u_printf_pointer_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
int64_t num = args[0].int64Value;
uint64_t num = (uint64_t)args[0].ptrValue;
UChar result[UPRINTF_BUFFER_SIZE];
int32_t len = UPRINTF_BUFFER_SIZE;
if (sizeof(void*)==sizeof(int32_t)) {
num &= UINT32_MAX;
}
/* format the pointer in hex */
ufmt_64tou(result, &len, num, 16, TRUE, info->fPrecision);

40
icu4c/source/test/iotest/iotest.cpp
View file

@ -56,6 +56,7 @@ static void TestFileFromICU(UFILE *myFile) {
UChar uStringBuf[256];
char myString[256] = "";
char testBuf[256] = "";
void *origPtr, *ptr;
U_STRING_DECL(myStringOrig, "My-String", 9);
U_STRING_INIT(myStringOrig, "My-String", 9);
@ -70,6 +71,17 @@ static void TestFileFromICU(UFILE *myFile) {
}
*n = -1234;
if (sizeof(void *) == 4) {
origPtr = (void *)0xdeadbeef;
} else if (sizeof(void *) == 8) {
origPtr = (void *) INT64_C(0x1000200030004000);
} else if (sizeof(void *) == 16) {
/* iSeries */
int32_t massiveBigEndianPtr[] = { 0x10002000, 0x30004000, 0x50006000, 0x70008000 };
origPtr = *((void **)massiveBigEndianPtr);
} else {
log_err("sizeof(void*)=%d hasn't been tested before", (int)sizeof(void*));
}
/* Test fprintf */
u_fprintf(myFile, "Signed decimal integer %%d: %d\n", *n);
@ -83,7 +95,7 @@ static void TestFileFromICU(UFILE *myFile) {
u_fprintf(myFile, "Uppercase float %%E: %E\n", myFloat);
u_fprintf(myFile, "Lowercase float %%g: %g\n", myFloat);
u_fprintf(myFile, "Uppercase float %%G: %G\n", myFloat);
// u_fprintf(myFile, "Pointer %%p: %p\n", myFile);
u_fprintf(myFile, "Pointer %%p: %p\n", origPtr);
u_fprintf(myFile, "Char %%c: %c\n", 'A');
u_fprintf(myFile, "UChar %%C: %C\n", (UChar)0x0041); /*'A'*/
u_fprintf(myFile, "String %%s: %s\n", "My-String");
@ -191,7 +203,11 @@ static void TestFileFromICU(UFILE *myFile) {
if (myFloat != *newDoubleValuePtr) {
log_err("%%G Got: %G, Expected: %G\n", *newDoubleValuePtr, myFloat);
}
// u_fscanf(myFile, "Pointer %%p: %p\n", newDoubleValue);
ptr = NULL;
u_fscanf(myFile, "Pointer %%p: %p\n", &ptr);
if (ptr != origPtr) {
log_err("%%p Got: %p, Expected: %p\n", ptr, origPtr);
}
u_fscanf(myFile, "Char %%c: %c\n", myString);
if (*myString != 'A') {
log_err("%%c Got: %c, Expected: A\n", *myString);
@ -1038,6 +1054,7 @@ static void TestString() {
char myString[512] = "";
char testBuf[512] = "";
int32_t retVal;
void *origPtr, *ptr;
U_STRING_DECL(myStringOrig, "My-String", 9);
U_STRING_INIT(myStringOrig, "My-String", 9);
@ -1045,6 +1062,17 @@ static void TestString() {
u_memset(uStringBuf, 0x0a, sizeof(uStringBuf) / sizeof(*uStringBuf));
*n = -1234;
if (sizeof(void *) == 4) {
origPtr = (void *)0xdeadbeef;
} else if (sizeof(void *) == 8) {
origPtr = (void *) INT64_C(0x1000200030004000);
} else if (sizeof(void *) == 16) {
/* iSeries */
int32_t massiveBigEndianPtr[] = { 0x10002000, 0x30004000, 0x50006000, 0x70008000 };
origPtr = *((void **)massiveBigEndianPtr);
} else {
log_err("sizeof(void*)=%d hasn't been tested before", (int)sizeof(void*));
}
/* Test sprintf */
u_sprintf(uStringBuf, NULL, "Signed decimal integer d: %d", *n);
@ -1124,7 +1152,13 @@ static void TestString() {
log_err("%%G Got: %G, Expected: %G\n", *newDoubleValuePtr, myFloat);
}
// u_sprintf(uStringBuf, NULL, "Pointer %%p: %p\n", myFile);
ptr = NULL;
u_sprintf(uStringBuf, NULL, "Pointer %%p: %p\n", origPtr);
u_sscanf(uStringBuf, NULL, "Pointer %%p: %p\n", &ptr);
if (ptr != origPtr || u_strlen(uStringBuf) != 13+(sizeof(void*)*2)) {
log_err("%%p Got: %p, Expected: %p\n", ptr, origPtr);
}
u_sprintf(uStringBuf, NULL, "Char c: %c", 'A');
u_sscanf(uStringBuf, NULL, "Char c: %c", myString);
if (*myString != 'A') {