git: 093e321dae46 - 2024Q4 - devel/nspr: update to 4.36
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 27 Oct 2024 16:23:38 UTC
The branch 2024Q4 has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=093e321dae46f61b59222174175bf76a4675f46e
commit 093e321dae46f61b59222174175bf76a4675f46e
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2024-10-27 16:19:02 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2024-10-27 16:23:08 +0000
devel/nspr: update to 4.36
Changes:
https://hg.mozilla.org/projects/nspr/shortlog/NSPR_4_36_RTM
(cherry picked from commit 82b2a6dd70329e58fad98a169ca250d94217b255)
---
devel/nspr/Makefile | 4 +-
devel/nspr/distinfo | 6 +-
devel/nspr/files/patch-bug301986 | 38 -
devel/nspr/files/patch-bug782109 | 31 -
devel/nspr/files/patch-libtests | 1272 ++++++------
devel/nspr/files/patch-tests | 3945 +++++++++++++++++++-------------------
devel/nspr/files/patch-warnings | 82 +-
devel/nspr/pkg-plist | 7 +-
8 files changed, 2603 insertions(+), 2782 deletions(-)
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index cdf68d7e1d48..ea8bc3156543 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nspr
-DISTVERSION= 4.35
+DISTVERSION= 4.36
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
@@ -29,7 +29,7 @@ post-patch:
post-build-TEST-on:
@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/lib/tests
@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/pr/tests
- @${LN} -fs libmy.so.1 ${BUILD_WRKSRC}/pr/tests/dll/libmy.so
+ @${LN} -fs ${BUILD_WRKSRC}/pr/tests/dll/libmy.so ${BUILD_WRKSRC}/pr/tests/dll/libmy.so.1
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index 5acb04013131..f249dd7b8a79 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662982815
-SHA256 (nspr-4.35.tar.gz) = 7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f
-SIZE (nspr-4.35.tar.gz) = 1096974
+TIMESTAMP = 1729811797
+SHA256 (nspr-4.36.tar.gz) = 55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895
+SIZE (nspr-4.36.tar.gz) = 1036274
diff --git a/devel/nspr/files/patch-bug301986 b/devel/nspr/files/patch-bug301986
deleted file mode 100644
index cae4712dace7..000000000000
--- a/devel/nspr/files/patch-bug301986
+++ /dev/null
@@ -1,38 +0,0 @@
-pthread_t can well be a 64-bit value -- on FreeBSD/amd64, for example.
-Better to just keep calling it pthread_t isntead of casting to anything.
-
- -mi
-
---- pr/include/private/pprthred.h.orig 2018-08-28 12:42:28 UTC
-+++ pr/include/private/pprthred.h
-@@ -11,6 +11,7 @@
- ** developers only.
- */
- #include "nspr.h"
-+#include <pthread.h>
-
- #if defined(XP_OS2)
- #define INCL_DOS
-@@ -59,7 +60,7 @@ NSPR_API(void) PR_DetachThread(void);
- ** Get the id of the named thread. Each thread is assigned a unique id
- ** when it is created or attached.
- */
--NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
-+NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
-
- /*
- ** Set the procedure that is called when a thread is dumped. The procedure
---- pr/src/pthreads/ptthread.c.orig 2018-08-28 12:42:28 UTC
-+++ pr/src/pthreads/ptthread.c
-@@ -1138,9 +1138,9 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn status)
- _exit(status);
- }
-
--PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
-+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
- {
-- return (PRUint32)thred->id; /* and I don't know what they will do with it */
-+ return thred->id; /* and I don't know what they will do with it */
- }
-
- /*
diff --git a/devel/nspr/files/patch-bug782109 b/devel/nspr/files/patch-bug782109
deleted file mode 100644
index 7469f95758bd..000000000000
--- a/devel/nspr/files/patch-bug782109
+++ /dev/null
@@ -1,31 +0,0 @@
---- pr/include/md/_freebsd.h.orig 2018-08-28 12:42:28 UTC
-+++ pr/include/md/_freebsd.h
-@@ -59,6 +59,14 @@
- #define _PR_HAVE_LARGE_OFF_T
-
- #if defined(_PR_PTHREADS)
-+#if __FreeBSD_version >= 602000
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#endif
-+#if __FreeBSD_version >= 700016
-+#define _PR_HAVE_GETHOST_R
-+#define _PR_HAVE_GETHOST_R_INT
-+#endif
- #if __FreeBSD_version >= 400008
- /*
- * libc_r before this version of FreeBSD doesn't have poll().
---- pr/src/misc/prnetdb.c.orig 2018-08-28 12:42:28 UTC
-+++ pr/src/misc/prnetdb.c
-@@ -81,11 +81,6 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
-
--#if __FreeBSD_version >= 602000
--#define _PR_HAVE_GETPROTO_R
--#define _PR_HAVE_5_ARG_GETPROTO_R
--#endif
--
- /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
- #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
- #define _PR_HAVE_GETPROTO_R
diff --git a/devel/nspr/files/patch-libtests b/devel/nspr/files/patch-libtests
index 0fbc2d76c3f9..3f7c8b7545e1 100644
--- a/devel/nspr/files/patch-libtests
+++ b/devel/nspr/files/patch-libtests
@@ -1,699 +1,645 @@
---- lib/tests/arena.c.orig 2019-10-15 14:21:38 UTC
+--- lib/tests/arena.c.orig
+++ lib/tests/arena.c
-@@ -36,6 +36,7 @@ void DumpAll( void )
- return;
- }
+@@ -33,6 +33,7 @@
+
+ void DumpAll(void) { return; }
+#if 0
/*
** Test Arena allocation.
*/
-@@ -96,6 +97,7 @@ static void ArenaGrow( void )
+@@ -90,6 +91,7 @@
- return;
+ return;
} /* end ArenaGrow() */
+#endif
-
/*
---- lib/tests/base64t.c.orig 2019-10-15 14:21:38 UTC
+ ** Test arena Mark and Release.
+--- lib/tests/base64t.c.orig
+++ lib/tests/base64t.c
-@@ -2362,7 +2362,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;
+@@ -2256,7 +2256,6 @@
- char *rv = PL_Base64Encode(array[i].plaintext, plen, (char *)0);
+ for (i = 0; i < sizeof(array) / sizeof(array[0]); i++) {
+ PRUint32 plen = PL_strlen(array[i].plaintext);
+- PRUint32 clen = ((plen + 2) / 3) * 4;
-@@ -3122,9 +3121,6 @@ PRBool test_024(void)
+ char* rv = PL_Base64Encode(array[i].plaintext, plen, (char*)0);
- for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
- {
-- PRUint32 plen = PL_strlen(array[i].plaintext);
-- PRUint32 clen = ((plen + 2)/3)*4;
+@@ -2965,9 +2964,6 @@
+ fflush(stdout);
+
+ 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);
+ char* rv = PL_Base64Encode(array[i].plaintext, 0, (char*)0);
- if( (char *)0 == rv )
-@@ -3258,8 +3254,6 @@ PRBool test_027(void)
+ if ((char*)0 == rv) {
+@@ -3088,8 +3084,6 @@
+ fflush(stdout);
- for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
- {
-- PRUint32 clen = PL_strlen(array[i].cyphertext);
+ 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);
+ char* rv = PL_Base64Decode(array[i].cyphertext, 0, (char*)0);
- if( (char *)0 == rv )
---- lib/tests/string.c.orig 2019-10-15 14:21:38 UTC
+ if ((char*)0 == rv) {
+--- lib/tests/string.c.orig
+++ 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;
- }
-@@ -240,8 +240,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;
- }
+@@ -111,7 +111,7 @@
+
+ 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;
+ }
+@@ -223,7 +223,7 @@
+
+ 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,
++ printf("FAIL %d: (%p, %s, %lu)->%p\n", i, array[i].dest,
+ array[i].str ? array[i].str : "(null)", array[i].len, rv);
+ return PR_FALSE;
+ }
+@@ -337,7 +337,7 @@
+
+ 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,
++ printf("FAIL %d: (%p, %s, %u)->%p\n", i, array[i].dest,
+ array[i].str ? array[i].str : "(null)", array[i].len, rv);
+ return PR_FALSE;
+ }
+@@ -379,7 +379,7 @@
+ char* rv = PL_strdup(array[i]);
-@@ -367,8 +367,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;
- }
+ 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;
+ }
-@@ -421,7 +421,7 @@ PRBool test_006(void)
+@@ -452,8 +452,8 @@
+ const char* b;
- 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;
- }
+ 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;
+ }
-@@ -507,8 +507,8 @@ PRBool test_007(void)
+@@ -620,17 +620,17 @@
- 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);
+ if ((const char*)0 == array[i].result) {
+ 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,
++ array[i].second ? array[i].second : "(null)", (unsigned)array[i].length,
+ rv);
+ return PR_FALSE;
+ }
+ } else {
+ 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].second ? array[i].second : "(null)", (unsigned)array[i].length,
+ array[i].result);
+ return PR_FALSE;
+ } else {
+@@ -639,10 +639,10 @@
+
+ while (*a) {
+ 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;
- }
+ }
+
+@@ -652,18 +652,18 @@
+
+ if (array[i].nulled) {
+ 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;
+ }
+ } else {
+ 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;
+ }
+ }
+@@ -733,17 +733,17 @@
+
+ if ((const char*)0 == array[i].result) {
+ 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,
++ array[i].second ? array[i].second : "(null)", (unsigned)array[i].length,
+ rv);
+ return PR_FALSE;
+ }
+ } else {
+ 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].second ? array[i].second : "(null)", (unsigned)array[i].length,
+ array[i].result);
+ return PR_FALSE;
+ } else {
+@@ -752,10 +752,10 @@
+
+ while (1) {
+ 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);
++ array[i].length, rv, (unsigned)array[i].result);
+ return PR_FALSE;
+ }
-@@ -700,10 +700,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;
- }
- }
-@@ -711,10 +711,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
-@@ -726,10 +726,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;
- }
-
-@@ -741,10 +741,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;
- }
- }
-@@ -752,10 +752,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;
- }
- }
-@@ -832,10 +832,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;
- }
- }
-@@ -843,10 +843,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
-@@ -858,10 +858,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;
- }
-
-@@ -1104,10 +1104,10 @@ PRBool test_012(void)
- break;
- }
+@@ -986,9 +986,9 @@
+ 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].two ? array[i].two : "(null)", (int)array[i].max, rv,
+ array[i].sign);
+ return PR_FALSE;
+ }
+@@ -1207,9 +1207,9 @@
+ 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);
+- 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].two ? array[i].two : "(null)", (int)array[i].max, rv,
+ array[i].sign);
+ return PR_FALSE;
+ }
+@@ -1270,14 +1270,14 @@
+ }
+ } else {
+ 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;
+ }
}
+@@ -1339,14 +1339,14 @@
+ }
+ } else {
+ 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;
+ }
-@@ -1338,10 +1338,10 @@ PRBool test_014(void)
- break;
- }
+ 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;
+ }
+ }
+@@ -1406,20 +1406,20 @@
+
+ if (PR_FALSE == array[i].ret) {
+ 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;
+ }
+ } else {
+ 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;
+ }
-- 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);
+ 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/%lu -> %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;
+ }
}
+@@ -1479,20 +1479,20 @@
+
+ if (PR_FALSE == array[i].ret) {
+ 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;
+ }
+ } else {
+ 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;
+ }
-@@ -1411,15 +1411,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;
- }
- }
-@@ -1491,15 +1491,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;
- }
- }
-@@ -1566,8 +1566,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;
- }
- }
-@@ -1575,15 +1575,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;
- }
- }
-@@ -1650,8 +1650,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;
- }
- }
-@@ -1659,15 +1659,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;
- }
- }
-@@ -1746,19 +1746,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;
- }
- }
-@@ -1837,19 +1837,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;
- }
- }
-@@ -1923,10 +1923,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;
- }
- }
-@@ -1934,19 +1934,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;
- }
- }
-@@ -2029,10 +2029,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;
- }
- }
-@@ -2040,19 +2040,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;
- }
- }
-@@ -2148,19 +2148,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;
- }
- }
-@@ -2256,19 +2256,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;
- }
- }
-@@ -2375,10 +2375,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;
- }
- }
-@@ -2386,19 +2386,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;
- }
- }
-@@ -2507,10 +2507,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;
- }
- }
-@@ -2518,19 +2518,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;
- }
- }
-@@ -2626,19 +2626,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,
*** 4826 LINES SKIPPED ***