kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/devel/nspr/files/patch-libtests
Jan Beich 032713d124 devel/nspr: cleanup cruft to improve style 
- Remove out-of-tree build (in favor of D4157)
- Remove custom do-install (config/nsinstall works fine) [1]
- Convert to new testing framework
- Refresh patches with |make makepatch| but leave damage out [2]

[1] Requires PORTREVISION per new entry in plist and DEBUG builds
    no longer embedding WRKDIR in source file name
[2] Here's a list with * indicating severity:
    *** Lost original ptthread.c hunk from patch-bug301986
    *** Mixed patch-bug782111 into patch-bug301986
    ** Duplicated context lines
    * Wrong timestamps with USES=pathfix
2015-11-21 02:26:15 +00:00

699 lines
29 KiB
Text
Raw Blame History

--- lib/tests/arena.c.orig 2015-10-16 13:22:19 UTC
+++ lib/tests/arena.c
@@ -36,6 +36,7 @@ void DumpAll( void )
return;
}
+#if 0
/*
** Test Arena allocation.
*/
@@ -96,6 +97,7 @@ static void ArenaGrow( void )
return;
} /* end ArenaGrow() */
+#endif
/*
--- lib/tests/base64t.c.orig 2015-10-16 13:22:19 UTC
+++ lib/tests/base64t.c
@@ -1987,7 +1987,6 @@ PRBool test_008(void)
for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
{
PRUint32 plen = PL_strlen(array[i].plaintext);
- PRUint32 clen = ((plen + 2)/3)*4;
char *rv = PL_Base64Encode(array[i].plaintext, plen, (char *)0);
@@ -2747,9 +2746,6 @@ PRBool test_024(void)
for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
{
- PRUint32 plen = PL_strlen(array[i].plaintext);
- PRUint32 clen = ((plen + 2)/3)*4;
-
char *rv = PL_Base64Encode(array[i].plaintext, 0, (char *)0);
if( (char *)0 == rv )
@@ -2883,8 +2879,6 @@ PRBool test_027(void)
for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
{
- PRUint32 clen = PL_strlen(array[i].cyphertext);
-
char *rv = PL_Base64Decode(array[i].cyphertext, 0, (char *)0);
if( (char *)0 == rv )
--- lib/tests/string.c.orig 2015-10-16 13:22:19 UTC
+++ lib/tests/string.c
@@ -127,7 +127,7 @@ PRBool test_003(void)
rv = PL_strcpy(array[i].dest, array[i].str);
if( array[i].rv != rv )
{
- printf("FAIL %d: (0x%x, %s)->0x%x\n", i, array[i].dest,
+ printf("FAIL %d: (%p, %s)->%p\n", i, array[i].dest,
array[i].str ? array[i].str : "(null)", rv);
return PR_FALSE;
}
@@ -237,8 +237,8 @@ PRBool test_004(void)
rv = PL_strncpy(array[i].dest, array[i].str, array[i].len);
if( array[i].rv != rv )
{
- printf("FAIL %d: (0x%x, %s, %lu)->0x%x\n", i, array[i].dest,
- array[i].str ? array[i].str : "(null)", array[i].len, rv);
+ printf("FAIL %d: (%p, %s, %u)->%p\n", i, array[i].dest,
+ array[i].str ? array[i].str : "(null)", (unsigned)array[i].len, rv);
return PR_FALSE;
}
@@ -363,8 +363,8 @@ PRBool test_005(void)
rv = PL_strncpyz(array[i].dest, array[i].str, array[i].len);
if( array[i].rv != rv )
{
- printf("FAIL %d: (0x%x, %s, %lu)->0x%x\n", i, array[i].dest,
- array[i].str ? array[i].str : "(null)", array[i].len, rv);
+ printf("FAIL %d: (%p, %s, %u)->%p\n", i, array[i].dest,
+ array[i].str ? array[i].str : "(null)", (unsigned)array[i].len, rv);
return PR_FALSE;
}
@@ -415,7 +415,7 @@ PRBool test_006(void)
if( (char *)0 == rv )
{
- printf("FAIL %d: 0x%x -> 0\n", i, array[i]);
+ printf("FAIL %d: %p -> 0\n", i, array[i]);
return PR_FALSE;
}
@@ -499,8 +499,8 @@ PRBool test_007(void)
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%lu -> 0\n", i,
- array[i].str ? array[i].str : "(null)", array[i].len);
+ printf("FAIL %d: %s,%u -> 0\n", i,
+ array[i].str ? array[i].str : "(null)", (unsigned)array[i].len);
return PR_FALSE;
}
@@ -684,10 +684,10 @@ PRBool test_009(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not zero\n", i,
+ printf("FAIL %d: %s+%s/%u -> %.32s, not zero\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length, rv);
+ (unsigned)array[i].length, rv);
return PR_FALSE;
}
}
@@ -695,10 +695,10 @@ PRBool test_009(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s+%s/%lu -> null, not %s\n", i,
+ printf("FAIL %d: %s+%s/%u -> null, not %s\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length, array[i].result);
+ (unsigned)array[i].length, array[i].result);
return PR_FALSE;
}
else
@@ -710,10 +710,10 @@ PRBool test_009(void)
{
if( *a != *b )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not %s\n", i,
+ printf("FAIL %d: %s+%s/%u -> %.32s, not %s\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length, rv, array[i].result);
+ (unsigned)array[i].length, rv, array[i].result);
return PR_FALSE;
}
@@ -725,10 +725,10 @@ PRBool test_009(void)
{
if( (char)0 != *b )
{
- printf("FAIL %d: %s+%s/%lu -> not nulled\n", i,
+ printf("FAIL %d: %s+%s/%u -> not nulled\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length);
+ (unsigned)array[i].length);
return PR_FALSE;
}
}
@@ -736,10 +736,10 @@ PRBool test_009(void)
{
if( (char)0 == *b )
{
- printf("FAIL %d: %s+%s/%lu -> overrun\n", i,
+ printf("FAIL %d: %s+%s/%u -> overrun\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length);
+ (unsigned)array[i].length);
return PR_FALSE;
}
}
@@ -814,10 +814,10 @@ PRBool test_010(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not zero\n", i,
+ printf("FAIL %d: %s+%s/%u -> %.32s, not zero\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length, rv);
+ (unsigned)array[i].length, rv);
return PR_FALSE;
}
}
@@ -825,10 +825,10 @@ PRBool test_010(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s+%s/%lu -> null, not %s\n", i,
+ printf("FAIL %d: %s+%s/%u -> null, not %s\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length, array[i].result);
+ (unsigned)array[i].length, array[i].result);
return PR_FALSE;
}
else
@@ -840,10 +840,10 @@ PRBool test_010(void)
{
if( *a != *b )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not %s\n", i,
+ printf("FAIL %d: %s+%s/%u -> %.32s, not %s\n", i,
array[i].first ? array[i].first : "(null)",
array[i].second ? array[i].second : "(null)",
- array[i].length, rv, array[i].result);
+ (unsigned)array[i].length, rv, array[i].result);
return PR_FALSE;
}
@@ -1072,10 +1072,10 @@ PRBool test_012(void)
break;
}
- printf("FAIL %d: %s-%s/%ld -> %d, not %d\n", i,
+ printf("FAIL %d: %s-%s/%d -> %d, not %d\n", i,
array[i].one ? array[i].one : "(null)",
array[i].two ? array[i].two : "(null)",
- array[i].max, rv, array[i].sign);
+ (int)array[i].max, rv, array[i].sign);
return PR_FALSE;
}
@@ -1294,10 +1294,10 @@ PRBool test_014(void)
break;
}
- printf("FAIL %d: %s-%s/%ld -> %d, not %d\n", i,
+ printf("FAIL %d: %s-%s/%d -> %d, not %d\n", i,
array[i].one ? array[i].one : "(null)",
array[i].two ? array[i].two : "(null)",
- array[i].max, rv, array[i].sign);
+ (int)array[i].max, rv, array[i].sign);
return PR_FALSE;
}
@@ -1367,15 +1367,15 @@ PRBool test_015(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c -> null, not +%lu\n", i, array[i].str,
- array[i].chr, array[i].off);
+ printf("FAIL %d: %s,%c -> null, not +%u\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%c -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
- array[i].chr, rv, array[i].str, array[i].off);
+ printf("FAIL %d: %s,%c -> %p, not %p+%u\n", i, array[i].str,
+ array[i].chr, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -1447,15 +1447,15 @@ PRBool test_016(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c -> null, not +%lu\n", i, array[i].str,
- array[i].chr, array[i].off);
+ printf("FAIL %d: %s,%c -> null, not +%u\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%c -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
- array[i].chr, rv, array[i].str, array[i].off);
+ printf("FAIL %d: %s,%c -> %p, not %p+%u\n", i, array[i].str,
+ array[i].chr, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -1522,8 +1522,8 @@ PRBool test_017(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%c/%lu -> %.32s, not zero\n", i, array[i].str,
- array[i].chr, array[i].max, rv);
+ printf("FAIL %d: %s,%c/%u -> %.32s, not zero\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -1531,15 +1531,15 @@ PRBool test_017(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c/%lu -> null, not +%lu\n", i, array[i].str,
- array[i].chr, array[i].max, array[i].off);
+ printf("FAIL %d: %s,%c/%u -> null, not +%u\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].max, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%c/%lu -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
- array[i].chr, array[i].max, rv, array[i].str, array[i].off);
+ printf("FAIL %d: %s,%c/%u -> %p, not %p+%u\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -1606,8 +1606,8 @@ PRBool test_018(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%c/%lu -> %.32s, not zero\n", i, array[i].str,
- array[i].chr, array[i].max, rv);
+ printf("FAIL %d: %s,%c/%u -> %.32s, not zero\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -1615,15 +1615,15 @@ PRBool test_018(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c/%lu -> null, not +%lu\n", i, array[i].str,
- array[i].chr, array[i].max, array[i].off);
+ printf("FAIL %d: %s,%c/%u -> null, not +%u\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].max, (unsigned)array[i].off);
return PR_FALSE;
}
- if( &array[i].str[ array[i].off ] != rv )
+ if( &array[i].str[ array[i].off ] != rv)
{
- printf("FAIL %d: %s,%c/%lu -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
- array[i].chr, array[i].max, rv, array[i].str, array[i].off);
+ printf("FAIL %d: %s,%c/%u -> %p, not %p+%u\n", i, array[i].str,
+ array[i].chr, (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -1702,19 +1702,19 @@ PRBool test_019(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
+ printf("FAIL %d: %s,%s -> null, not +%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].off);
+ (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- rv, array[i].str, array[i].off);
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -1793,19 +1793,19 @@ PRBool test_020(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
+ printf("FAIL %d: %s,%s -> null, not +%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].off);
+ (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- rv, array[i].str, array[i].off);
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -1879,10 +1879,10 @@ PRBool test_021(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
+ printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].max, rv);
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -1890,19 +1890,19 @@ PRBool test_021(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> null, not +%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].max, array[i].off);
+ (unsigned)array[i].max, array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].max, rv, array[i].str, array[i].off);
+ (unsigned)array[i].max, rv, array[i].str, array[i].off);
return PR_FALSE;
}
}
@@ -1985,10 +1985,10 @@ PRBool test_022(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
+ printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].max, rv);
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -1996,19 +1996,19 @@ PRBool test_022(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> null, not +%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].max, array[i].off);
+ (unsigned)array[i].max, array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].chrs ? array[i].chrs : "(null)",
- array[i].max, rv, array[i].str, array[i].off);
+ (unsigned)array[i].max, rv, array[i].str, array[i].off);
return PR_FALSE;
}
}
@@ -2104,19 +2104,19 @@ PRBool test_023(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].str, array[i].off);
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- rv, array[i].str, array[i].off);
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -2212,19 +2212,19 @@ PRBool test_024(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].str, array[i].off);
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- rv, array[i].str, array[i].off);
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -2331,10 +2331,10 @@ PRBool test_025(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
+ printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv);
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -2342,19 +2342,19 @@ PRBool test_025(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, array[i].str, array[i].off);
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv, array[i].str, array[i].off);
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -2463,10 +2463,10 @@ PRBool test_026(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
+ printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv);
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -2474,19 +2474,19 @@ PRBool test_026(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, array[i].str, array[i].off);
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv, array[i].str, array[i].off);
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -2582,19 +2582,19 @@ PRBool test_027(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].str, array[i].off);
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- rv, array[i].str, array[i].off);
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -2690,19 +2690,19 @@ PRBool test_028(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].str, array[i].off);
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- rv, array[i].str, array[i].off);
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -2809,10 +2809,10 @@ PRBool test_029(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
+ printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv);
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -2820,19 +2820,19 @@ PRBool test_029(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, array[i].str, array[i].off);
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv, array[i].str, array[i].off);
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
@@ -2941,10 +2941,10 @@ PRBool test_030(void)
{
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
+ printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv);
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
}
@@ -2952,19 +2952,19 @@ PRBool test_030(void)
{
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> null, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, array[i].str, array[i].off);
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
+ printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
array[i].str ? array[i].str : "(null)",
array[i].sub ? array[i].sub : "(null)",
- array[i].max, rv, array[i].str, array[i].off);
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
}
Reference in a new issue View git blame Copy permalink