# Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= nspr VERSION= 4.35 REVISION= 1 KEYWORDS= devel VARIANTS= standard SDESC[standard]= Platform-neutral API for system-like functions HOMEPAGE= https://firefox-source-docs.mozilla.org/nspr/index.html CONTACT= nobody DOWNLOAD_GROUPS= main SITES[main]= MOZILLA/nspr/releases/v4.35/src DISTFILE[1]= nspr-4.35.tar.gz:main DF_INDEX= 1 SPKGS[standard]= complete primary dev OPTIONS_AVAILABLE= none OPTIONS_STANDARD= none USES= cpe gmake DISTNAME= nspr-4.35/nspr LICENSE= MPL:primary LICENSE_TERMS= primary:{{WRKDIR}}/TERMS LICENSE_FILE= MPL:{{WRKSRC}}/LICENSE LICENSE_AWK= TERMS:"^$$" LICENSE_SOURCE= TERMS:{{WRKSRC}}/pr/include/nspr.h LICENSE_SCHEME= solo CPE_PRODUCT= netscape_portable_runtime CPE_VENDOR= mozilla FPC_EQUIVALENT= devel/nspr MUST_CONFIGURE= gnu CONFIGURE_ARGS= --enable-64bit post-patch: # Do not install tools to build itself ${REINPLACE_CMD} -e '/RELEASE_BINS/d' \ ${WRKSRC}/pr/src/misc/Makefile.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.${LIBEXT} [FILE:207:descriptions/desc.primary] Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions. The API is used in the Mozilla client, many of Netscape/AOL/iPlanet's and other software offerings. [FILE:95:distinfo] 7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f 1096974 nspr-4.35.tar.gz [FILE:74:manifests/plist.primary] @(,,444) lib/libnspr4.so @(,,444) lib/libplc4.so @(,,444) lib/libplds4.so [FILE:1050:manifests/plist.dev] bin/nspr-config include/nspr/ nspr.h plarena.h plarenas.h plbase64.h plerror.h plgetopt.h plhash.h plstr.h pratom.h prbit.h prclist.h prcmon.h prcountr.h prcpucfg.h prcvar.h prdtoa.h prenv.h prerr.h prerror.h prinet.h prinit.h prinrval.h prio.h pripcsem.h prlink.h prlock.h prlog.h prlong.h prmem.h prmon.h prmwait.h prnetdb.h prolock.h prpdce.h prprf.h prproces.h prrng.h prrwlock.h prshm.h prshma.h prsystem.h prthread.h prtime.h prtpool.h prtrace.h prtypes.h prvrsion.h prwin16.h include/nspr/md/ _aix32.cfg _aix64.cfg _bsdi.cfg _darwin.cfg _dragonfly.cfg _freebsd.cfg _hpux32.cfg _hpux64.cfg _linux.cfg _netbsd.cfg _nto.cfg _openbsd.cfg _os2.cfg _qnx.cfg _riscos.cfg _scoos.cfg _solaris.cfg _unixware.cfg _unixware7.cfg _win95.cfg _winnt.cfg include/nspr/obsolete/ pralarm.h probslet.h protypes.h prsem.h include/nspr/private/ pprio.h pprthred.h prpriv.h @(,,444) lib/libnspr4.a @(,,444) lib/libplc4.a @(,,444) lib/libplds4.a lib/pkgconfig/nspr.pc share/aclocal/nspr.m4 [FILE:1192:patches/patch-bug301986] 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 2022-05-25 21:34:56 UTC +++ pr/include/private/pprthred.h @@ -11,6 +11,7 @@ ** developers only. */ #include "nspr.h" +#include #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 2022-05-25 21:34:56 UTC +++ pr/src/pthreads/ptthread.c @@ -1183,9 +1183,9 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn _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 */ } /* [FILE:489:patches/patch-config_nspr.pc.in] --- config/nspr.pc.in.orig 2022-05-25 21:34:56 UTC +++ config/nspr.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: NSPR Description: The Netscape Portable Runtime Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ -Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -Cflags: -I@includedir@ +Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@ +Cflags: -I${includedir} [FILE:2145:patches/patch-configure] --- configure.orig 2022-09-12 11:40:15 UTC +++ configure @@ -6563,7 +6563,22 @@ tools are selected during the Xcode/Deve fi ;; -*-freebsd*) +*-dragonfly*) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + fi + $as_echo "#define XP_UNIX 1" >>confdefs.h + $as_echo "#define HAVE_BSD_FLOCK 1" >>confdefs.h + $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC + DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' + MDCPUCFG_H=_dragonfly.cfg + PR_MD_CSRCS=freebsd.c + ;; + +*-freebsd*|*-midnight*) if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi @@ -7232,7 +7247,6 @@ $as_echo "$as_me: WARNING: Unknown versi CPU_ARCH=`uname -p` MDCPUCFG_H=_solaris.cfg PR_MD_CSRCS=solaris.c - LD=/usr/ccs/bin/ld MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' RESOLVE_LINK_SYMBOLS=1 case "${OS_RELEASE}" in @@ -7240,7 +7254,6 @@ $as_echo "$as_me: WARNING: Unknown versi ;; *) # It is safe to use the -Bdirect linker flag on Solaris 10 or later. - USE_B_DIRECT=1 ;; esac if test -n "$GNU_CC"; then @@ -7936,7 +7949,7 @@ $as_echo_n "checking whether ${CC-cc} ac if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then ac_cv_have_dash_pthread=yes case "$target_os" in - freebsd*) + freebsd*|dragonfly*|midnight*) # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) @@ -7974,7 +7987,7 @@ $as_echo "$ac_cv_have_dash_pthreads" >&6 _PTHREAD_LDFLAGS= fi ;; - *-freebsd*) + *-freebsd*|*-dragonfly*|*-midnight*) $as_echo "#define _REENTRANT 1" >>confdefs.h $as_echo "#define _THREAD_SAFE 1" >>confdefs.h @@ -8064,7 +8077,7 @@ case "$target" in fi ;; -*-freebsd*) +*-freebsd*|*-dragonfly*|*-midnight*) if test -n "$USE_NSPR_THREADS"; then $as_echo "#define _PR_LOCAL_THREADS_ONLY 1" >>confdefs.h [FILE:29818:patches/patch-libtests] --- lib/tests/arena.c.orig 2022-05-25 21:34:56 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 2022-05-25 21:34:56 UTC +++ 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; char *rv = PL_Base64Encode(array[i].plaintext, plen, (char *)0); @@ -3122,9 +3121,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 ) @@ -3258,8 +3254,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 2022-05-25 21:34:56 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; } @@ -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; } @@ -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; } @@ -421,7 +421,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; } @@ -507,8 +507,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; } @@ -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; } - 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; } @@ -1338,10 +1338,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; } @@ -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, 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; } } @@ -2734,19 +2734,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; } } @@ -2853,10 +2853,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; } } @@ -2864,19 +2864,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; } } @@ -2985,10 +2985,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; } } @@ -2996,19 +2996,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; } } [FILE:6203:patches/patch-pr_include_md___dragonfly.cfg] --- /dev/null 2022-09-16 19:41:29 UTC +++ pr/include/md/_dragonfly.cfg @@ -0,0 +1,208 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef nspr_cpucfg___ +#define nspr_cpucfg___ + +#ifndef XP_UNIX +#define XP_UNIX +#endif + +#define PR_AF_INET6 28 /* same as AF_INET6 */ + +#ifndef HAVE_LONG_LONG +#define HAVE_LONG_LONG +#endif + +#if defined(__i386__) + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#undef HAVE_ALIGNED_DOUBLES +#undef HAVE_ALIGNED_LONGLONGS + +#define PR_BYTES_PER_BYTE 1 +#define PR_BYTES_PER_SHORT 2 +#define PR_BYTES_PER_INT 4 +#define PR_BYTES_PER_INT64 8 +#define PR_BYTES_PER_LONG 4 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 4 +#define PR_BYTES_PER_DWORD 8 +#define PR_BYTES_PER_WORD_LOG2 2 +#define PR_BYTES_PER_DWORD_LOG2 3 + +#define PR_BITS_PER_BYTE 8 +#define PR_BITS_PER_SHORT 16 +#define PR_BITS_PER_INT 32 +#define PR_BITS_PER_INT64 64 +#define PR_BITS_PER_LONG 32 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 32 + +#define PR_BITS_PER_BYTE_LOG2 3 +#define PR_BITS_PER_SHORT_LOG2 4 +#define PR_BITS_PER_INT_LOG2 5 +#define PR_BITS_PER_INT64_LOG2 6 +#define PR_BITS_PER_LONG_LOG2 5 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 5 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 4 +#define PR_ALIGN_OF_INT64 4 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 4 +#define PR_ALIGN_OF_POINTER 4 + +#elif defined(__alpha__) + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#define HAVE_ALIGNED_DOUBLES +#define HAVE_ALIGNED_LONGLONGS +#define IS_64 + +#define PR_BYTES_PER_BYTE 1 +#define PR_BYTES_PER_SHORT 2 +#define PR_BYTES_PER_INT 4 +#define PR_BYTES_PER_INT64 8 +#define PR_BYTES_PER_LONG 8 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 8 +#define PR_BYTES_PER_DWORD 8 +#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_DWORD_LOG2 3 + +#define PR_BITS_PER_BYTE 8 +#define PR_BITS_PER_SHORT 16 +#define PR_BITS_PER_INT 32 +#define PR_BITS_PER_INT64 64 +#define PR_BITS_PER_LONG 64 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 64 + +#define PR_BITS_PER_BYTE_LOG2 3 +#define PR_BITS_PER_SHORT_LOG2 4 +#define PR_BITS_PER_INT_LOG2 5 +#define PR_BITS_PER_INT64_LOG2 6 +#define PR_BITS_PER_LONG_LOG2 6 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 6 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 8 +#define PR_ALIGN_OF_INT64 8 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 + +#elif defined(__amd64__) + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#define HAVE_ALIGNED_DOUBLES +#define HAVE_ALIGNED_LONGLONGS +#define IS_64 + +#define PR_BYTES_PER_BYTE 1 +#define PR_BYTES_PER_SHORT 2 +#define PR_BYTES_PER_INT 4 +#define PR_BYTES_PER_INT64 8 +#define PR_BYTES_PER_LONG 8 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 8 +#define PR_BYTES_PER_DWORD 8 +#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_DWORD_LOG2 3 + +#define PR_BITS_PER_BYTE 8 +#define PR_BITS_PER_SHORT 16 +#define PR_BITS_PER_INT 32 +#define PR_BITS_PER_INT64 64 +#define PR_BITS_PER_LONG 64 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 64 + +#define PR_BITS_PER_BYTE_LOG2 3 +#define PR_BITS_PER_SHORT_LOG2 4 +#define PR_BITS_PER_INT_LOG2 5 +#define PR_BITS_PER_INT64_LOG2 6 +#define PR_BITS_PER_LONG_LOG2 6 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 6 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 8 +#define PR_ALIGN_OF_INT64 8 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 +#define PR_ALIGN_OF_WORD 8 + +#else + +#error "Unknown CPU architecture" + +#endif + +#ifndef NO_NSPR_10_SUPPORT + +#define BYTES_PER_BYTE PR_BYTES_PER_BYTE +#define BYTES_PER_SHORT PR_BYTES_PER_SHORT +#define BYTES_PER_INT PR_BYTES_PER_INT +#define BYTES_PER_INT64 PR_BYTES_PER_INT64 +#define BYTES_PER_LONG PR_BYTES_PER_LONG +#define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT +#define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE +#define BYTES_PER_WORD PR_BYTES_PER_WORD +#define BYTES_PER_DWORD PR_BYTES_PER_DWORD + +#define BITS_PER_BYTE PR_BITS_PER_BYTE +#define BITS_PER_SHORT PR_BITS_PER_SHORT +#define BITS_PER_INT PR_BITS_PER_INT +#define BITS_PER_INT64 PR_BITS_PER_INT64 +#define BITS_PER_LONG PR_BITS_PER_LONG +#define BITS_PER_FLOAT PR_BITS_PER_FLOAT +#define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE +#define BITS_PER_WORD PR_BITS_PER_WORD + +#define BITS_PER_BYTE_LOG2 PR_BITS_PER_BYTE_LOG2 +#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2 +#define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2 +#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2 +#define BITS_PER_LONG_LOG2 PR_BITS_PER_LONG_LOG2 +#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2 +#define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2 +#define BITS_PER_WORD_LOG2 PR_BITS_PER_WORD_LOG2 + +#define ALIGN_OF_SHORT PR_ALIGN_OF_SHORT +#define ALIGN_OF_INT PR_ALIGN_OF_INT +#define ALIGN_OF_LONG PR_ALIGN_OF_LONG +#define ALIGN_OF_INT64 PR_ALIGN_OF_INT64 +#define ALIGN_OF_FLOAT PR_ALIGN_OF_FLOAT +#define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE +#define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER +#define ALIGN_OF_WORD PR_ALIGN_OF_WORD + +#define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2 +#define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 +#define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 + +#endif /* NO_NSPR_10_SUPPORT */ + +#endif /* nspr_cpucfg___ */ [FILE:6201:patches/patch-pr_include_md___dragonfly.h] --- /dev/null 2022-09-16 19:41:29 UTC +++ pr/include/md/_dragonfly.h @@ -0,0 +1,225 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef nspr_dragonfly_defs_h___ +#define nspr_dragonfly_defs_h___ + +#include "prthread.h" + +#if 0 +#if __FreeBSD__ >= 2 +#include /* for __FreeBSD_version */ +#endif +#include +#endif + +#define PR_LINKER_ARCH "dragonfly" +#define _PR_SI_SYSNAME "DRAGONFLY" +#if defined(__i386__) +#define _PR_SI_ARCHITECTURE "x86" +#elif defined(__amd64__) +#define _PR_SI_ARCHITECTURE "amd64" +#else +#error "Unknown CPU architecture" +#endif + +#define PR_DLL_SUFFIX ".so" + +#define _PR_VMBASE 0x30000000 +#define _PR_STACK_VMBASE 0x50000000 +#define _MD_DEFAULT_STACK_SIZE 65536L +#define _MD_MMAP_FLAGS MAP_PRIVATE + +#undef HAVE_STACK_GROWING_UP +#define HAVE_DLL +#define USE_DLFCN +#define _PR_HAVE_SOCKADDR_LEN +#define _PR_STAT_HAS_ST_ATIMESPEC +#define _PR_HAVE_LARGE_OFF_T + +#define _PR_HAVE_GETPROTO_R +#define _PR_HAVE_5_ARG_GETPROTO_R +#define _PR_HAVE_GETHOST_R +#define _PR_HAVE_GETHOST_R_INT + +#define _PR_POLL_AVAILABLE + +#define _PR_HAVE_SYSV_SEMAPHORES +#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY + +#define _PR_INET6 +#define _PR_HAVE_INET_NTOP +#define _PR_HAVE_GETHOSTBYNAME2 +#define _PR_HAVE_GETADDRINFO +#define _PR_INET6_PROBE +#define _PR_IPV6_V6ONLY_PROBE + +#define USE_SETJMP + +#ifndef _PR_PTHREADS +#include + +#define PR_CONTEXT_TYPE sigjmp_buf + +#define CONTEXT(_th) ((_th)->md.context) + +#define _MD_GET_SP(_th) (_th)->md.context[0]._sjb[2] +#define PR_NUM_GCREGS _JBLEN + +/* +** Initialize a thread context to run "_main()" when started +*/ +#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ +{ \ + *status = PR_TRUE; \ + if (sigsetjmp(CONTEXT(_thread), 1)) { \ + _main(); \ + } \ + _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \ +} + +#define _MD_SWITCH_CONTEXT(_thread) \ + if (!sigsetjmp(CONTEXT(_thread), 1)) { \ + (_thread)->md.errcode = errno; \ + _PR_Schedule(); \ + } + +/* +** Restore a thread context, saved by _MD_SWITCH_CONTEXT +*/ +#define _MD_RESTORE_CONTEXT(_thread) \ +{ \ + errno = (_thread)->md.errcode; \ + _MD_SET_CURRENT_THREAD(_thread); \ + siglongjmp(CONTEXT(_thread), 1); \ +} + +/* Machine-dependent (MD) data structures */ + +struct _MDThread { + PR_CONTEXT_TYPE context; + int id; + int errcode; +}; + +struct _MDThreadStack { + PRInt8 notused; +}; + +struct _MDLock { + PRInt8 notused; +}; + +struct _MDSemaphore { + PRInt8 notused; +}; + +struct _MDCVar { + PRInt8 notused; +}; + +struct _MDSegment { + PRInt8 notused; +}; + +/* + * md-specific cpu structure field + */ +#define _PR_MD_MAX_OSFD FD_SETSIZE + +struct _MDCPU_Unix { + PRCList ioQ; + PRUint32 ioq_timeout; + PRInt32 ioq_max_osfd; + PRInt32 ioq_osfd_cnt; +#ifndef _PR_USE_POLL + fd_set fd_read_set, fd_write_set, fd_exception_set; + PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD], + fd_exception_cnt[_PR_MD_MAX_OSFD]; +#else + struct pollfd *ioq_pollfds; + int ioq_pollfds_size; +#endif /* _PR_USE_POLL */ +}; + +#define _PR_IOQ(_cpu) ((_cpu)->md.md_unix.ioQ) +#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu)) +#define _PR_FD_READ_SET(_cpu) ((_cpu)->md.md_unix.fd_read_set) +#define _PR_FD_READ_CNT(_cpu) ((_cpu)->md.md_unix.fd_read_cnt) +#define _PR_FD_WRITE_SET(_cpu) ((_cpu)->md.md_unix.fd_write_set) +#define _PR_FD_WRITE_CNT(_cpu) ((_cpu)->md.md_unix.fd_write_cnt) +#define _PR_FD_EXCEPTION_SET(_cpu) ((_cpu)->md.md_unix.fd_exception_set) +#define _PR_FD_EXCEPTION_CNT(_cpu) ((_cpu)->md.md_unix.fd_exception_cnt) +#define _PR_IOQ_TIMEOUT(_cpu) ((_cpu)->md.md_unix.ioq_timeout) +#define _PR_IOQ_MAX_OSFD(_cpu) ((_cpu)->md.md_unix.ioq_max_osfd) +#define _PR_IOQ_OSFD_CNT(_cpu) ((_cpu)->md.md_unix.ioq_osfd_cnt) +#define _PR_IOQ_POLLFDS(_cpu) ((_cpu)->md.md_unix.ioq_pollfds) +#define _PR_IOQ_POLLFDS_SIZE(_cpu) ((_cpu)->md.md_unix.ioq_pollfds_size) + +#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu) 32 + +struct _MDCPU { + struct _MDCPU_Unix md_unix; +}; + +#define _MD_INIT_LOCKS() +#define _MD_NEW_LOCK(lock) PR_SUCCESS +#define _MD_FREE_LOCK(lock) +#define _MD_LOCK(lock) +#define _MD_UNLOCK(lock) +#define _MD_INIT_IO() +#define _MD_IOQ_LOCK() +#define _MD_IOQ_UNLOCK() + +extern PRStatus _MD_InitializeThread(PRThread *thread); + +#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) +#define _MD_INIT_THREAD _MD_InitializeThread +#define _MD_EXIT_THREAD(thread) +#define _MD_SUSPEND_THREAD(thread) _MD_suspend_thread +#define _MD_RESUME_THREAD(thread) _MD_resume_thread +#define _MD_CLEAN_THREAD(_thread) + +extern PRStatus _MD_CREATE_THREAD( + PRThread *thread, + void (*start) (void *), + PRThreadPriority priority, + PRThreadScope scope, + PRThreadState state, + PRUint32 stackSize); +extern void _MD_SET_PRIORITY(struct _MDThread *thread, PRUintn newPri); +extern PRStatus _MD_WAIT(PRThread *, PRIntervalTime timeout); +extern PRStatus _MD_WAKEUP_WAITER(PRThread *); +extern void _MD_YIELD(void); + +#endif /* ! _PR_PTHREADS */ + +extern void _MD_EarlyInit(void); + +#define _MD_EARLY_INIT _MD_EarlyInit +#define _MD_FINAL_INIT _PR_UnixInit +#define _MD_INTERVAL_USE_GTOD + +/* + * We wrapped the select() call. _MD_SELECT refers to the built-in, + * unwrapped version. + */ +#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv) + +#if defined(_PR_POLL_AVAILABLE) +#include +#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout) +#endif + +/* freebsd has INADDR_LOOPBACK defined, but in /usr/include/rpc/types.h, and I didn't + want to be including that.. */ +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK (u_long)0x7F000001 +#endif + +/* For writev() */ +#include + +#endif /* nspr_freebsd_defs_h___ */ [FILE:1204:patches/patch-pr_include_md___freebsd.h] --- pr/include/md/_freebsd.h.orig 2022-05-25 21:34:56 UTC +++ pr/include/md/_freebsd.h @@ -59,7 +59,15 @@ #define _PR_HAVE_LARGE_OFF_T #if defined(_PR_PTHREADS) -#if __FreeBSD_version >= 400008 +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__MidnightBSD__) +#define _PR_HAVE_GETPROTO_R +#define _PR_HAVE_5_ARG_GETPROTO_R +#endif +#if defined(__FreeBSD__) || defined(__MidnightBSD__) +#define _PR_HAVE_GETHOST_R +#define _PR_HAVE_GETHOST_R_INT +#endif +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__MidnightBSD__) /* * libc_r before this version of FreeBSD doesn't have poll(). * Although libc has poll(), it is not thread-safe so we can't @@ -68,7 +76,7 @@ #define _PR_POLL_AVAILABLE #endif #else -#if __FreeBSD_version >= 300000 +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__MidnightBSD__) #define _PR_POLL_AVAILABLE #define _PR_USE_POLL #endif @@ -77,7 +85,7 @@ #define _PR_HAVE_SYSV_SEMAPHORES #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY -#if __FreeBSD_version >= 400014 +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__MidnightBSD__) #define _PR_INET6 #define _PR_HAVE_INET_NTOP #define _PR_HAVE_GETHOSTBYNAME2 [FILE:1235:patches/patch-pr_include_md___pth.h] --- pr/include/md/_pth.h.orig 2022-05-25 21:34:56 UTC +++ pr/include/md/_pth.h @@ -86,6 +86,7 @@ */ #if defined(AIX) || defined(SOLARIS) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ + || defined(__DragonFly__) \ || defined(HPUX) || defined(FREEBSD) \ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ || defined(NTO) || defined(DARWIN) \ @@ -133,6 +134,7 @@ #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ + || defined(__DragonFly__) \ || defined(FREEBSD) #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) @@ -175,6 +177,7 @@ extern int (*_PT_aix_yield_fcn)(); #define _PT_PTHREAD_YIELD() (*_PT_aix_yield_fcn)() #elif defined(HPUX) || defined(SOLARIS) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ + || defined(__DragonFly__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ || defined(BSDI) || defined(NTO) || defined(DARWIN) \ || defined(UNIXWARE) || defined(RISCOS) [FILE:279:patches/patch-pr_include_md_prosdep.h] --- pr/include/md/prosdep.h.orig 2022-05-25 21:34:56 UTC +++ pr/include/md/prosdep.h @@ -43,6 +43,9 @@ PR_BEGIN_EXTERN_C #elif defined(OPENBSD) #include "md/_openbsd.h" +#elif defined(__DragonFly__) +#include "md/_dragonfly.h" + #elif defined(BSDI) #include "md/_bsdi.h" [FILE:403:patches/patch-pr_src_md_unix_uxrng.c] --- pr/src/md/unix/uxrng.c.orig 2022-05-25 21:34:56 UTC +++ pr/src/md/unix/uxrng.c @@ -64,6 +64,7 @@ GetHighResClock(void *buf, size_t maxbyt #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \ + || defined(__DragonFly__) \ || defined(__GNU__)) #include #include [FILE:699:patches/patch-pr_src_misc_prnetdb.c] --- pr/src/misc/prnetdb.c.orig 2022-05-25 21:34:56 UTC +++ pr/src/misc/prnetdb.c @@ -73,11 +73,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) #define _PR_HAVE_GETPROTO_R @@ -302,7 +297,7 @@ _pr_QueryNetIfs(void) } #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ - || defined(NETBSD) || defined(OPENBSD) + || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) /* * Use the BSD getifaddrs function. [FILE:1246:patches/patch-pr_src_pthreads_ptio.c] --- pr/src/pthreads/ptio.c.orig 2022-05-25 21:34:56 UTC +++ pr/src/pthreads/ptio.c @@ -191,6 +191,7 @@ static PRBool _pr_ipv6_v6only_on_by_defa || defined(HPUX10_30) || defined(HPUX11) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ + || defined(__DragonFly__) \ || defined(BSDI) || defined(NTO) || defined(DARWIN) \ || defined(UNIXWARE) || defined(RISCOS) #define _PRSelectFdSetArg_t fd_set * @@ -3523,6 +3524,7 @@ static PRIOMethods _pr_socketpollfd_meth #if defined(HPUX) || defined(SOLARIS) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ + || defined(__DragonFly__) \ || defined(OPENBSD) || defined(BSDI) || defined(NTO) \ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) #define _PR_FCNTL_FLAGS O_NONBLOCK @@ -5309,6 +5311,7 @@ PR_IMPLEMENT(PRInt32) PR_Select( if (timeout == PR_INTERVAL_NO_TIMEOUT) { tvp = NULL; + start = 0; /* Not needed, but shuts down a warning */ } else { tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout); tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds( [FILE:881:patches/patch-pr_src_pthreads_ptsynch.c] --- pr/src/pthreads/ptsynch.c.orig 2022-09-12 11:40:15 UTC +++ pr/src/pthreads/ptsynch.c @@ -25,7 +25,7 @@ static pthread_condattr_t _pt_cvar_attr; extern PTDebug pt_debug; /* this is shared between several modules */ #endif /* defined(DEBUG) */ -#if defined(FREEBSD) +#if defined(FREEBSD) && (defined(DEBUG) || defined(FORCE_PR_ASSERT)) /* * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK. * Newer versions return EBUSY. We still need to support both. @@ -951,7 +951,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor * From the semctl(2) man page in glibc 2.0 */ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ - || (defined(FREEBSD) && __FreeBSD_version < 1200059) \ + || defined(__DragonFly__) \ || defined(OPENBSD) || defined(BSDI) \ || defined(DARWIN) /* union semun is defined by including */ [FILE:83892:patches/patch-tests] --- lib/tests/Makefile.in.orig 2022-05-25 21:34:56 UTC +++ lib/tests/Makefile.in @@ -159,7 +159,7 @@ else ifeq ($(OS_ARCH),OS2) $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) else - $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@ + $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@ endif endif endif --- pr/tests/cleanup.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/cleanup.c @@ -15,7 +15,7 @@ static void PR_CALLBACK Thread(void *sleep) { - PR_Sleep(PR_SecondsToInterval((PRUint32)sleep)); + PR_Sleep(PR_SecondsToInterval((intptr_t)sleep)); printf("Thread exiting\n"); } @@ -39,7 +39,8 @@ int main(int argc, char **argv) PRThreadScope type = PR_LOCAL_THREAD; PRFileDesc *err = PR_GetSpecialFD(PR_StandardError); PLOptState *opt = PL_CreateOptState(argc, argv, "Ghs:S:t:cC:"); - PRIntn concurrency = 1, child_sleep = 10, main_sleep = 5, threads = 1; + PRIntn concurrency = 1, main_sleep = 5, threads = 1; + intptr_t child_sleep = 10; PR_STDIO_INIT(); while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) @@ -82,7 +83,7 @@ int main(int argc, char **argv) (PR_LOCAL_THREAD == type) ? "LOCAL" : "GLOBAL"); PR_fprintf(err, "\tConcurrency: %d\n", concurrency); PR_fprintf(err, "\tNumber of threads: %d\n", threads); - PR_fprintf(err, "\tThread sleep: %d\n", child_sleep); + PR_fprintf(err, "\tThread sleep: %d\n", (int)child_sleep); PR_fprintf(err, "\tMain sleep: %d\n", main_sleep); PR_fprintf(err, "\tCleanup will %sbe called\n\n", (cleanup) ? "" : "NOT "); --- pr/tests/cltsrv.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/cltsrv.c @@ -949,7 +949,7 @@ int main(int argc, char** argv) { PRUintn index; PRBool boolean; - CSClient_t *client; + CSClient_t *client = NULL; PRStatus rv, joinStatus; CSServer_t *server = NULL; --- pr/tests/cvar.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/cvar.c @@ -138,15 +138,15 @@ static int alive; static void PR_CALLBACK CXReader(void *arg) { CircBuf *cbp = (CircBuf *)arg; - PRInt32 i, n; + intptr_t i, n; void *data; n = count / 2; for (i = 0; i < n; i++) { data = GetCBData(cbp); - if ((int)data != i) + if ((intptr_t)data != i) if (debug_mode) { - printf("data mismatch at for i = %d usec\n", i); + printf("data mismatch at for i = %ld usec\n", (long)i); } } @@ -159,7 +159,7 @@ static void PR_CALLBACK CXReader(void *a static void PR_CALLBACK CXWriter(void *arg) { CircBuf *cbp = (CircBuf *)arg; - PRInt32 i, n; + intptr_t i, n; n = count / 2; for (i = 0; i < n; i++) { --- pr/tests/cvar2.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/cvar2.c @@ -96,7 +96,7 @@ PrivateCondVarThread(void *_info) for (index=0; indexloops; index++) { PR_Lock(info->lock); if (*info->tcount == 0) { - DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n", + DPRINTF(("PrivateCondVarThread: thread %p waiting on cvar = %p\n", PR_GetCurrentThread(), info->cvar)); PR_WaitCondVar(info->cvar, info->timeout); } @@ -109,8 +109,8 @@ PrivateCondVarThread(void *_info) PR_Lock(info->exitlock); (*info->exitcount)++; PR_NotifyCondVar(info->exitcvar); - DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n", - PR_GetCurrentThread(), info->exitcvar,(*info->exitcount))); + DPRINTF(("PrivateCondVarThread: thread %p notified exitcvar = %p cnt = %d\n", + PR_GetCurrentThread(), info->exitcvar,(int)(*info->exitcount))); PR_Unlock(info->exitlock); } #if 0 @@ -159,7 +159,7 @@ CreateTestThread(threadinfo *info, void CondVarTestSUU(void *_arg) { - PRInt32 arg = (PRInt32)_arg; + PRInt32 arg = (PRInt32)(intptr_t)_arg; PRInt32 index, loops; threadinfo *list; PRLock *sharedlock; @@ -191,7 +191,7 @@ CondVarTestSUU(void *_arg) PR_TRUE, PR_LOCAL_THREAD); index++; - DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread)); + DPRINTF(("CondVarTestSUU: created thread %p\n",list[index].thread)); } for (loops = 0; loops < count; loops++) { @@ -201,7 +201,7 @@ CondVarTestSUU(void *_arg) (*list[index].tcount)++; PR_NotifyCondVar(list[index].cvar); PR_Unlock(list[index].lock); - DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n", + DPRINTF(("PrivateCondVarThread: thread %p notified cvar = %p\n", PR_GetCurrentThread(), list[index].cvar)); } @@ -231,7 +231,7 @@ CondVarTestSUU(void *_arg) void CondVarTestSUK(void *_arg) { - PRInt32 arg = (PRInt32)_arg; + PRInt32 arg = (PRInt32)(intptr_t)_arg; PRInt32 index, loops; threadinfo *list; PRLock *sharedlock; @@ -307,7 +307,7 @@ CondVarTestSUK(void *_arg) void CondVarTestPUU(void *_arg) { - PRInt32 arg = (PRInt32)_arg; + PRInt32 arg = (PRInt32)(intptr_t)_arg; PRInt32 index, loops; threadinfo *list; PRLock *sharedlock; @@ -342,7 +342,7 @@ CondVarTestPUU(void *_arg) PR_FALSE, PR_LOCAL_THREAD); - DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread)); + DPRINTF(("CondVarTestPUU: created thread %p\n",list[index].thread)); index++; tcount++; } @@ -360,8 +360,8 @@ CondVarTestPUU(void *_arg) PR_Lock(exitlock); /* Wait for threads to finish */ while(exitcount < arg) { - DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n", - PR_GetCurrentThread(), exitcvar, exitcount)); + DPRINTF(("CondVarTestPUU: thread %p waiting on exitcvar = %p cnt = %d\n", + PR_GetCurrentThread(), exitcvar, (int)exitcount)); PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60)); } PR_ASSERT(exitcount >= arg); @@ -371,7 +371,7 @@ CondVarTestPUU(void *_arg) /* Join all the threads */ for(index=0; index<(arg); index++) { - DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread)); + DPRINTF(("CondVarTestPUU: joining thread %p\n",list[index].thread)); PR_JoinThread(list[index].thread); if (list[index].internal) { PR_Lock(list[index].lock); @@ -393,7 +393,7 @@ CondVarTestPUU(void *_arg) void CondVarTestPUK(void *_arg) { - PRInt32 arg = (PRInt32)_arg; + PRInt32 arg = (PRInt32)(intptr_t)_arg; PRInt32 index, loops; threadinfo *list; PRLock *sharedlock; @@ -475,7 +475,7 @@ CondVarTestPUK(void *_arg) void CondVarTest(void *_arg) { - PRInt32 arg = (PRInt32)_arg; + PRInt32 arg = (PRInt32)(intptr_t)_arg; PRInt32 index, loops; threadinfo *list; PRLock *sharedlock; @@ -609,7 +609,7 @@ CondVarTest(void *_arg) void CondVarTimeoutTest(void *_arg) { - PRInt32 arg = (PRInt32)_arg; + PRInt32 arg = (PRInt32)(intptr_t)_arg; PRInt32 index, loops; threadinfo *list; PRLock *sharedlock; @@ -721,7 +721,7 @@ CondVarTimeoutTest(void *_arg) void CondVarMixedTest(void *_arg) { - PRInt32 arg = (PRInt32)_arg; + PRInt32 arg = (PRInt32)(intptr_t)_arg; PRInt32 index, loops; threadinfo *list; PRLock *sharedlock; @@ -811,7 +811,7 @@ CondVarMixedTest(void *_arg) for(index=0; index<(arg*4); index+=3) { PR_Lock(list[index].lock); - *list[index].tcount++; + list[index].tcount++; PR_NotifyCondVar(list[index].cvar); PR_Unlock(list[index].lock); @@ -883,7 +883,7 @@ static void Measure(void (*func)(void *) double d; start = PR_IntervalNow(); - (*func)((void *)arg); + (*func)((void *)(intptr_t)arg); stop = PR_IntervalNow(); d = (double)PR_IntervalToMicroseconds(stop - start); @@ -948,7 +948,7 @@ This test is run with %d, %d, %d, and %d PR_SetConcurrency(2); for (threads = default_threads; threads < default_threads*5; threads+=default_threads) { - printf("\n%ld Thread tests\n", threads); + printf("\n%d Thread tests\n", (int)threads); Measure(CondVarTestSUU, threads, "Condvar simple test shared UU"); Measure(CondVarTestSUK, threads, "Condvar simple test shared UK"); Measure(CondVarTestPUU, threads, "Condvar simple test priv UU"); --- pr/tests/foreign.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/foreign.c @@ -175,7 +175,7 @@ static void OneShot(void *arg) PRFileDesc *fd; PRDir *dir; PRFileDesc *pair[2]; - PRIntn test = (PRIntn)arg; + intptr_t test = (intptr_t)arg; for (test = 0; test < 12; ++test) { @@ -272,7 +272,7 @@ static void OneShot(void *arg) int main(int argc, char **argv) { PRStatus rv; - PRInt32 thread_cnt = DEFAULT_THREAD_COUNT; + intptr_t thread_cnt = DEFAULT_THREAD_COUNT; PLOptStatus os; PLOptState *opt = PL_CreateOptState(argc, argv, "dt:"); --- pr/tests/forktest.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/forktest.c @@ -47,7 +47,7 @@ ClientThreadFunc(void *arg) { PRNetAddr addr; PRFileDesc *sock = NULL; - PRInt32 tmp = (PRInt32)arg; + intptr_t tmp = (intptr_t)arg; /* * Make sure the PR_Accept call will block @@ -143,7 +143,7 @@ DoIO(void) goto finish; } clientThread = PR_CreateThread( PR_USER_THREAD, ClientThreadFunc, - (void *) PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, + (void *)(intptr_t)PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0); if (clientThread == NULL) { fprintf(stderr, "Cannot create client thread: (%d, %d)\n", @@ -151,6 +151,9 @@ DoIO(void) failed_already = 1; goto finish; } + printf("Wait one second before accept\n"); + fflush(stdout); + PR_Sleep(PR_SecondsToInterval(1)); printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port)); fflush(stdout); sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5)); --- pr/tests/getai.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/getai.c @@ -13,8 +13,15 @@ int main(int argc, char **argv) PRAddrInfo *ai; void *iter; PRNetAddr addr; + const char *host; - ai = PR_GetAddrInfoByName(argv[1], PR_AF_UNSPEC, PR_AI_ADDRCONFIG); + if (argc > 1) { + host = argv[1]; + } + else { + host = "www.FreeBSD.org"; + } + ai = PR_GetAddrInfoByName(host, PR_AF_UNSPEC, PR_AI_ADDRCONFIG); if (ai == NULL) { fprintf(stderr, "PR_GetAddrInfoByName failed: (%d, %d)\n", PR_GetError(), PR_GetOSError()); --- pr/tests/instrumt.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/instrumt.c @@ -36,6 +36,7 @@ */ #include +#define DEBUG #include #include #include @@ -50,7 +51,6 @@ #define COUNT_LIMIT (10 * ( 1024)) #define SMALL_TRACE_BUFSIZE ( 60 * 1024 ) - typedef enum { CountLoop = 1, @@ -78,10 +78,10 @@ static void Help(void) static void ListCounters(void) { +#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS) PR_DEFINE_COUNTER( qh ); PR_DEFINE_COUNTER( rh ); const char *qn, *rn, *dn; - const char **qname = &qn, **rname = &rn, **desc = &dn; PRUint32 tCtr; PR_INIT_COUNTER_HANDLE( qh, NULL ); @@ -92,7 +92,7 @@ static void ListCounters(void) PR_FIND_NEXT_COUNTER_RNAME(rh, rh, qh ); while ( rh != NULL ) { - PR_GET_COUNTER_NAME_FROM_HANDLE( rh, qname, rname, desc ); + PR_GET_COUNTER_NAME_FROM_HANDLE( rh, &qn, &rn, &dn ); PR_GET_COUNTER(tCtr, rh); PR_LOG( lm, msgLevel, ( "QName: %s RName: %s Desc: %s Value: %ld\n", @@ -101,15 +101,15 @@ static void ListCounters(void) } PR_FIND_NEXT_COUNTER_QNAME(qh, qh); } - return; +#endif } /* end ListCounters() */ static void ListTraces(void) { +#if defined(DEBUG) || defined(FORCE_NSPR_TRACE) PR_DEFINE_TRACE( qh ); PR_DEFINE_TRACE( rh ); const char *qn, *rn, *dn; - const char **qname = &qn, **rname = &rn, **desc = &dn; PR_INIT_TRACE_HANDLE( qh, NULL ); PR_FIND_NEXT_TRACE_QNAME(qh, qh ); @@ -119,7 +119,7 @@ static void ListTraces(void) PR_FIND_NEXT_TRACE_RNAME(rh, rh, qh ); while ( rh != NULL ) { - PR_GET_TRACE_NAME_FROM_HANDLE( rh, qname, rname, desc ); + PR_GET_TRACE_NAME_FROM_HANDLE( rh, &qn, &rn, &dn ); PR_LOG( lm, msgLevel, ( "QName: %s RName: %s Desc: %s", qn, rn, dn )); @@ -127,7 +127,7 @@ static void ListTraces(void) } PR_FIND_NEXT_TRACE_QNAME(qh, qh); } - return; +#endif } /* end ListCounters() */ @@ -326,7 +326,7 @@ static void PR_CALLBACK SampleTrace( voi */ static void TraceTest( void ) { - PRInt32 i; + PRIntn i = 0; PRInt32 size; PR_DEFINE_TRACE( th ); PRThread *t1, *t2; --- pr/tests/io_timeout.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/io_timeout.c @@ -22,11 +22,13 @@ /* Used to get the command line option */ #include "plgetopt.h" +#include #include +#include #include "nspr.h" #define NUM_THREADS 1 -#define BASE_PORT 8000 +#define BASE_PORT 38011 #define DEFAULT_ACCEPT_TIMEOUT 2 typedef struct threadInfo { @@ -38,7 +40,7 @@ typedef struct threadInfo { } threadInfo; PRIntn failed_already = 0; -PRIntn debug_mode = 0; +PRIntn debug_mode = 1; #define LOCAL_SCOPE_STRING "LOCAL scope" #define GLOBAL_SCOPE_STRING "GLOBAL scope" @@ -54,7 +56,7 @@ thread_main(void *_info) PRFileDesc *clientSock; PRStatus rv; PRThreadScope tscope; - char *scope_str; + const char *scope_str; if (debug_mode) { @@ -74,6 +76,7 @@ thread_main(void *_info) break; default: PR_NOT_REACHED("Invalid thread scope"); + scope_str = NULL; break; } printf("thread id %d, scope %s\n", info->id, scope_str); @@ -92,8 +95,12 @@ thread_main(void *_info) listenAddr.inet.ip = PR_htonl(PR_INADDR_ANY); rv = PR_Bind(listenSock, &listenAddr); if (rv == PR_FAILURE) { - if (debug_mode) { - printf("unable to bind\n"); + if (debug_mode) + printf("unable to bind to %d: %s\n", + BASE_PORT + info->id, strerror(PR_GetOSError())); + if (PR_GetOSError() == EADDRINUSE) { + printf("can not proceed with this test\n"); + exit(0); } failed_already=1; goto dead; @@ -117,8 +124,9 @@ thread_main(void *_info) if (clientSock == NULL) { if (PR_GetError() == PR_IO_TIMEOUT_ERROR) { if (debug_mode) { - printf("PR_Accept() timeout worked!\n"); - printf("TEST PASSED! PR_Accept() returned error %d\n", + printf("PR_Accept() timeout worked!\n" + "TEST PASSED! PR_Accept() returned error " + "PR_IO_TIMEOUT_ERROR (%ld)\n", PR_IO_TIMEOUT_ERROR); } } else { --- pr/tests/layer.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/layer.c @@ -57,7 +57,10 @@ static PRUint16 default_port = 12273 POR static PRFileDesc *PushLayer(PRFileDesc *stack) { PRFileDesc *layer = PR_CreateIOLayerStub(identity, &myMethods); - PRStatus rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer); +#if defined(DEBUG) || defined(FORCE_PR_ASSERT) + PRStatus rv = /* we only need rv for PR_ASSERT() */ +#endif + PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer); if (verbosity > quiet) { PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer, stack); } --- pr/tests/lazyinit.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/lazyinit.c @@ -43,7 +43,6 @@ int main(int argc, char **argv) char *path = NULL; PRDir *dir = NULL; PRLock *ml = NULL; - PRCondVar *cv = NULL; PRThread *thread = NULL; PRIntervalTime interval = 0; PRFileDesc *file, *udp, *tcp, *pair[2]; --- pr/tests/lltest.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/lltest.c @@ -651,6 +651,7 @@ TestConversion( void ) return; } +#if 0 static void ShiftCompileOnly() { /* @@ -667,6 +668,7 @@ static void ShiftCompileOnly() LL_ISHL(ia, 49, 32); } /* ShiftCompileOnly */ +#endif /* @@ -751,7 +753,6 @@ TestArithmetic( void ) PRInt64 largeValPlusOne = LL_INIT( 0x00000002, 0x00000000 ); PRInt64 largeValTimesTwo = LL_INIT( 0x00000003, 0xfffffffe ); PRInt64 largeMultCand = LL_INIT( 0x00000000, 0x7fffffff ); - PRInt64 largeMinusMultCand = LL_INIT( 0xffffffff, 0x10000001 ); PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 ); PRInt64 largeNumSHL5 = LL_INIT( 0x0000001f, 0xffffffe0 ); PRInt64 result, result2; --- pr/tests/mbcs.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/mbcs.c @@ -54,13 +54,12 @@ char *dirName = NULL; /* directory nam /* ** Traverse directory */ -static void TraverseDirectory( unsigned char *dir ) +static void TraverseDirectory(const char *dir) { PRDir *cwd; PRDirEntry *dirEntry; PRFileInfo info; PRStatus rc; - PRInt32 err; PRFileDesc *fd; char nextDir[256]; char file[256]; @@ -81,16 +80,16 @@ static void TraverseDirectory( unsigned exit(1); } if ( PR_FILE_FILE == info.type ) { - printf("File: %s \tsize: %ld\n", dirEntry->name, info.size ); + printf("File: %s \tsize: %ld\n", dirEntry->name, (long)info.size ); fd = PR_Open( file, PR_RDONLY, 0 ); if ( NULL == fd ) { printf("PR_Open() failed. Error: %ld, OSError: %ld\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); } rc = PR_Close( fd ); if ( PR_FAILURE == rc ) { printf("PR_Close() failed. Error: %ld, OSError: %ld\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); } } else if ( PR_FILE_DIRECTORY == info.type ) { sprintf( nextDir, "%s/%s", dir, dirEntry->name ); --- pr/tests/nbconn.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/nbconn.c @@ -54,8 +54,7 @@ int main(int argc, char **argv) PRStatus rv; PRSocketOptionData optData; const char *hostname = NULL; - PRIntn default_case, n, bytes_read, bytes_sent; - PRInt32 failed_already = 0; + PRIntn default_case, n; /* * -d debug mode @@ -169,7 +168,7 @@ int main(int argc, char **argv) exit(1); } printf( "PR_GetConnectStatus: connect failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); } PR_Close(sock); printf( "PASS\n"); @@ -240,7 +239,7 @@ connection_success_test() PRThread *thr = NULL; Server_Param sp; char send_buf[DATA_BUF_SIZE], recv_buf[DATA_BUF_SIZE]; - PRIntn default_case, n, bytes_read, bytes_sent; + PRIntn n, bytes_read, bytes_sent; PRIntn failed_already = 0; /* @@ -317,7 +316,7 @@ connection_success_test() failed_already=1; goto def_exit; } - DPRINTF(("Created TCP_Server thread [0x%x]\n",thr)); + DPRINTF(("Created TCP_Server thread [%p]\n", thr)); pd.fd = conn_fd; pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT; n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT); @@ -396,7 +395,7 @@ connection_success_test() DPRINTF(("Data integrity verified\n")); } else { fprintf(stderr,"PR_GetConnectStatus: connect failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already = 1; goto def_exit; } @@ -505,7 +504,6 @@ connection_failure_test() goto def_exit; } if (PR_GetConnectStatus(&pd) == PR_SUCCESS) { - PRInt32 rv; fprintf(stderr,"PR_GetConnectStatus succeeded, expected to fail\n"); failed_already = 1; goto def_exit; --- pr/tests/nblayer.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/nblayer.c @@ -360,7 +360,7 @@ static PRStatus PR_CALLBACK MyClose(PRFi static PRInt16 PR_CALLBACK MyPoll( PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags) { - PRInt16 my_flags, new_flags; + PRInt16 my_flags = -1, new_flags; PRFilePrivate *mine = (PRFilePrivate*)fd->secret; if (0 != (PR_POLL_READ & in_flags)) { @@ -405,7 +405,7 @@ static PRFileDesc * PR_CALLBACK MyAccept PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout) { PRStatus rv; - PRFileDesc *newfd, *layer = fd; + PRFileDesc *newfd; PRFileDesc *newstack; PRFilePrivate *newsecret; @@ -507,6 +507,8 @@ static PRInt32 PR_CALLBACK MyRecv( mine->rcvinprogress = 0; return mine->rcvreq; /* << -- that's it! */ default: + PR_ASSERT(!"How did I get this mine->rcvstate?"); + rv = -1; break; } } while (-1 != rv); @@ -575,6 +577,8 @@ static PRInt32 PR_CALLBACK MySend( mine->xmtinprogress = 0; return mine->xmtreq; /* <<-- That's the one! */ default: + PR_ASSERT(!"How did I get this mine->xmtstate?"); + rv = -1; break; } } while (-1 != rv); --- pr/tests/nonblock.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/nonblock.c @@ -37,7 +37,7 @@ static void PR_CALLBACK clientThreadFunc(void *arg) { - PRUintn port = (PRUintn)arg; + intptr_t port = (intptr_t)arg; PRFileDesc *sock; PRNetAddr addr; char buf[CHUNK_SIZE]; @@ -145,7 +145,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn printf("%s", buf); clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort, + clientThreadFunc, (void *) (intptr_t)listenPort, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { @@ -189,7 +189,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn if (retVal != -1 || PR_GetError() != PR_WOULD_BLOCK_ERROR) { PL_PrintError("First Receive:\n"); fprintf(stderr, "First PR_Recv: retVal: %ld, Error: %ld\n", - retVal, PR_GetError()); + (long)retVal, (long)PR_GetError()); exit(1); } printf("read: EWOULDBLOCK, good\n"); @@ -199,7 +199,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn if (retVal != CHUNK_SIZE) { PL_PrintError("Second Receive:\n"); fprintf(stderr, "Second PR_Recv: retVal: %ld, Error: %ld\n", - retVal, PR_GetError()); + (long)retVal, (long)PR_GetError()); exit(1); } printf("read: %d bytes, good\n", retVal); --- pr/tests/obsints.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/obsints.c @@ -25,6 +25,9 @@ int main(int argc, char **argv) #else /* NO_NSPR_10_SUPPORT */ #include "prtypes.h" /* which includes protypes.h */ +#if !defined(__GNUC__) +# define __unused +#endif int main(int argc, char **argv) { @@ -32,17 +35,17 @@ int main(int argc, char **argv) * Compilation fails if any of these integer types are not * defined by protypes.h. */ - intn in; - uintn uin; - uint ui; - int8 i8; - uint8 ui8; - int16 i16; - uint16 ui16; - int32 i32; - uint32 ui32; - int64 i64; - uint64 ui64; + intn in __unused; + uintn uin __unused; + uint ui __unused; + int8 i8 __unused; + uint8 ui8 __unused; + int16 i16 __unused; + uint16 ui16 __unused; + int32 i32 __unused; + uint32 ui32 __unused; + int64 i64 __unused; + uint64 ui64 __unused; printf("PASS\n"); return 0; --- pr/tests/parsetm.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/parsetm.c @@ -32,8 +32,8 @@ static void PrintExplodedTime(const PREx /* Print day of the week, month, day, hour, minute, and second */ if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ", - dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, - et->tm_hour, et->tm_min, et->tm_sec); + dayOfWeek[et->tm_wday], month[et->tm_month], (long)et->tm_mday, + (long)et->tm_hour, (long)et->tm_min, (long)et->tm_sec); /* Print time zone */ totalOffset = et->tm_params.tp_gmt_offset + et->tm_params.tp_dst_offset; @@ -50,7 +50,7 @@ static void PrintExplodedTime(const PREx hourOffset = totalOffset / 3600; minOffset = (totalOffset % 3600) / 60; if (debug_mode) { - printf("%s%02ld%02ld ", sign, hourOffset, minOffset); + printf("%s%02ld%02ld ", sign, (long)hourOffset, (long)minOffset); } } --- pr/tests/peek.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/peek.c @@ -137,7 +137,7 @@ static void ClientNB(void *arg) { PRFileDesc *sock; PRSocketOptionData opt; - PRUint16 port = (PRUint16) arg; + PRUint16 port = (intptr_t) arg; PRNetAddr addr; char buf[BUFFER_SIZE]; PRPollDesc pd; @@ -301,7 +301,7 @@ RunTest(PRThreadScope scope, PRFileDesc exit(1); } client = PR_CreateThread( - PR_USER_THREAD, ClientNB, (void *) port, + PR_USER_THREAD, ClientNB, (void *)(intptr_t) port, PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0); if (NULL == client) { fprintf(stderr, "PR_CreateThread failed\n"); --- pr/tests/perf.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/perf.c @@ -142,7 +142,7 @@ static void PR_CALLBACK CXReader(void *a n = count / 2; for (i = 0; i < n; i++) { while (cxq == 0) { - DPRINTF(("CXReader: thread = 0x%lx waiting\n", + DPRINTF(("CXReader: thread = %p waiting\n", PR_GetCurrentThread())); PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT); } @@ -155,7 +155,7 @@ static void PR_CALLBACK CXReader(void *a --alive; PR_Notify(mon2); PR_ExitMonitor(mon2); - DPRINTF(("CXReader: thread = 0x%lx exiting\n", PR_GetCurrentThread())); + DPRINTF(("CXReader: thread = %p exiting\n", PR_GetCurrentThread())); } static void PR_CALLBACK CXWriter(void *arg) @@ -166,7 +166,7 @@ static void PR_CALLBACK CXWriter(void *a n = count / 2; for (i = 0; i < n; i++) { while (cxq == 1) { - DPRINTF(("CXWriter: thread = 0x%lx waiting\n", + DPRINTF(("CXWriter: thread = %p waiting\n", PR_GetCurrentThread())); PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT); } @@ -179,7 +179,7 @@ static void PR_CALLBACK CXWriter(void *a --alive; PR_Notify(mon2); PR_ExitMonitor(mon2); - DPRINTF(("CXWriter: thread = 0x%lx exiting\n", PR_GetCurrentThread())); + DPRINTF(("CXWriter: thread = %p exiting\n", PR_GetCurrentThread())); } static void ContextSwitch(PRThreadScope scope1, PRThreadScope scope2) @@ -199,7 +199,7 @@ static void ContextSwitch(PRThreadScope if (NULL == t1) { fprintf(stderr, "ContextSwitch: cannot create thread\n"); } else { - DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n", + DPRINTF(("ContextSwitch: created %s thread = %p\n", (scope1 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), t1)); @@ -213,7 +213,7 @@ static void ContextSwitch(PRThreadScope if (NULL == t2) { fprintf(stderr, "ContextSwitch: cannot create thread\n"); } else { - DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n", + DPRINTF(("ContextSwitch: created %s thread = %p\n", (scope2 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), t2)); @@ -255,10 +255,10 @@ static void PR_CALLBACK SemaThread(void n = count / 2; for (i = 0; i < n; i++) { - DPRINTF(("SemaThread: thread = 0x%lx waiting on sem = 0x%lx\n", + DPRINTF(("SemaThread: thread = %p waiting on sem = %p\n", PR_GetCurrentThread(), sem[0])); PR_WaitSem(sem[0]); - DPRINTF(("SemaThread: thread = 0x%lx posting on sem = 0x%lx\n", + DPRINTF(("SemaThread: thread = %p posting on sem = %p\n", PR_GetCurrentThread(), sem[1])); PR_PostSem(sem[1]); } @@ -267,7 +267,7 @@ static void PR_CALLBACK SemaThread(void --alive; PR_Notify(mon2); PR_ExitMonitor(mon2); - DPRINTF(("SemaThread: thread = 0x%lx exiting\n", PR_GetCurrentThread())); + DPRINTF(("SemaThread: thread = %p exiting\n", PR_GetCurrentThread())); } static PRSemaphore *sem_set1[2]; @@ -295,7 +295,7 @@ static void SemaContextSwitch(PRThreadSc if (NULL == t1) { fprintf(stderr, "SemaContextSwitch: cannot create thread\n"); } else { - DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n", + DPRINTF(("SemaContextSwitch: created %s thread = %p\n", (scope1 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), t1)); @@ -310,7 +310,7 @@ static void SemaContextSwitch(PRThreadSc if (NULL == t2) { fprintf(stderr, "SemaContextSwitch: cannot create thread\n"); } else { - DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n", + DPRINTF(("SemaContextSwitch: created %s thread = %p\n", (scope2 == PR_GLOBAL_THREAD ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"), t2)); --- pr/tests/pipepong.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/pipepong.c @@ -36,7 +36,7 @@ int main(int argc, char **argv) nBytes = fread(buf, 1, 5, stdin); fprintf(stderr, "pong process: received \"%s\"\n", buf); if (nBytes != 5) { - fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n", + fprintf(stderr, "pong process: expected 5 bytes but got %zd bytes\n", nBytes); exit(1); } --- pr/tests/poll_nm.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/poll_nm.c @@ -47,7 +47,7 @@ PRIntn debug_mode; static void PR_CALLBACK clientThreadFunc(void *arg) { - PRUintn port = (PRUintn) arg; + PRUintn port = (intptr_t) arg; PRFileDesc *sock; PRNetAddr addr; char buf[128]; @@ -200,7 +200,7 @@ int main(int argc, char **argv) npds = 5; clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort1, + clientThreadFunc, (void *)(intptr_t)listenPort1, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { @@ -210,7 +210,7 @@ int main(int argc, char **argv) } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort2, + clientThreadFunc, (void *)(intptr_t)listenPort2, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { --- pr/tests/prfz.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/prfz.c @@ -7,7 +7,7 @@ */ #include "prprf.h" -#include +#include #include #include #include --- pr/tests/provider.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/provider.c @@ -1078,7 +1078,7 @@ int main(int argc, char **argv) { PRUintn index; PRBool boolean; - CSClient_t *client; + CSClient_t *client = NULL; PRStatus rv, joinStatus; CSServer_t *server = NULL; char *thread_type; --- pr/tests/prpoll.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/prpoll.c @@ -39,7 +39,7 @@ int main(int argc, char **argv) static void clientThreadFunc(void *arg) { - PRUint16 port = (PRUint16) arg; + PRUint16 port = (PRUint16)(uintptr_t)arg; PRFileDesc *sock; PRNetAddr addr; char buf[BUF_SIZE]; @@ -73,7 +73,7 @@ int main(int argc, char **argv) PRInt32 rv; PROsfd sd; struct sockaddr_in saddr; - PRIntn saddr_len; + socklen_t saddr_len; PRUint16 listenPort3; PRFileDesc *socket_poll_fd; PRIntn i, j; @@ -199,7 +199,7 @@ int main(int argc, char **argv) npds--; clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort1, + clientThreadFunc, (void *)(uintptr_t)listenPort1, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { @@ -208,7 +208,7 @@ int main(int argc, char **argv) } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort2, + clientThreadFunc, (void *)(uintptr_t)listenPort2, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { @@ -217,7 +217,7 @@ int main(int argc, char **argv) } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort3, + clientThreadFunc, (void *)(uintptr_t)listenPort3, PR_PRIORITY_NORMAL, PR_GLOBAL_BOUND_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { --- pr/tests/randseed.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/randseed.c @@ -48,7 +48,6 @@ static void Help( void ) static void PrintRand( void *buf, PRIntn size ) { PRUint32 *rp = buf; - PRIntn i; printf("%4.4d--\n", size ); while (size > 0 ) { --- pr/tests/ranfile.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/ranfile.c @@ -130,7 +130,7 @@ static void PR_CALLBACK Thread(void *arg PRStatus rv = PR_SUCCESS; Hammer_t *cd = (Hammer_t*)arg; - (void)sprintf(filename, "%ssg%04ld.dat", baseName, cd->id); + (void)sprintf(filename, "%ssg%04d.dat", baseName, (int)cd->id); if (debug_mode) { printf("Starting work on %s\n", filename); @@ -405,8 +405,8 @@ int main(int argc, char **argv) durationTot += duration; } else if (debug_mode) printf( - "%s: test failed %s after %ld seconds\n", - programName, where[hammer[poll].problem], duration); + "%s: test failed %s after %d seconds\n", + programName, where[hammer[poll].problem], (int)duration); else { failed_already=1; } @@ -414,7 +414,7 @@ int main(int argc, char **argv) } } if (debug_mode) printf( - "%s: [%ld [%ld] %ld] writes/sec average\n", + "%s: [%d [%d] %d] writes/sec average\n", programName, writesMin, writesTot * 1000 / durationTot, writesMax); PR_DestroyCondVar(cv); --- pr/tests/runtests.sh.orig 2022-05-25 21:34:56 UTC +++ pr/tests/runtests.sh @@ -226,7 +226,7 @@ OBJDIR=`basename $PWD` printf "\nNSPR Test Results - $OBJDIR\n\n" printf "BEGIN\t\t\t`date`\n" printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n" -printf "Test\t\t\tResult\n\n" +printf " Test\t\t\tResult\n\n" if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then for prog in $TESTS do @@ -244,10 +244,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ else for prog in $TESTS do - printf "$prog (`date +%T`)" - printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1 - export test_rval - ./$prog >> ${LOGFILE} 2>&1 & + printf %16s $prog + ./$prog >> $prog.output 2>&1 & test_pid=$! sleep_pid=0 if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0 @@ -262,9 +260,9 @@ else printf "\t\t\tPassed\n"; else printf "\t\t\tFAILED\n"; + sed "s,^, $prog: ," < $prog.output rval=1 fi; - printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1 done fi; --- pr/tests/sel_spd.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/sel_spd.c @@ -15,6 +15,9 @@ #include #include #include +#if defined(XP_UNIX) || defined(XP_OS2_EMX) +# include /* getopt(3) */ +#endif #if defined(XP_UNIX) #include @@ -34,19 +37,19 @@ #define PORT_BASE 19000 PORT_INC_DO PORT_INC_3264 typedef struct timer_slot_t { - unsigned long d_connect; - unsigned long d_cl_data; - unsigned long d_sv_data; - unsigned long d_close; - unsigned long d_total; - unsigned long requests; + unsigned int d_connect; + unsigned int d_cl_data; + unsigned int d_sv_data; + unsigned int d_close; + unsigned int d_total; + unsigned int requests; } timer_slot_t; -static long _iterations = 5; -static long _client_data = 8192; +static int _iterations = 5; +static int _client_data = 8192; -static long _server_data = (128*1024); -static long _threads_max = 10, _threads = 10; +static int _server_data = (128*1024); +static int _threads_max = 10, _threads = 10; static int verbose=0; static PRMonitor *exit_cv; @@ -102,7 +105,7 @@ _server_thread(void *arg_id) { void _client_thread(void *); int *id = (int *)arg_id; - PRFileDesc *sock; + PRFileDesc *sock = NULL; PRSocketOptionData sockopt; PRNetAddr sa; PRFileDesc * newsock; @@ -480,12 +483,12 @@ void tally_results(int verbose) { int index; - unsigned long tot_connect = 0; - unsigned long tot_cl_data = 0; - unsigned long tot_sv_data = 0; - unsigned long tot_close = 0; - unsigned long tot_all = 0; - unsigned long tot_requests = 0; + unsigned int tot_connect = 0; + unsigned int tot_cl_data = 0; + unsigned int tot_sv_data = 0; + unsigned int tot_close = 0; + unsigned int tot_all = 0; + unsigned int tot_requests = 0; fprintf(stdout, "Server results:\n\n"); for (index=0; index<_threads_max*2; index+=2) { --- pr/tests/selct_nm.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/selct_nm.c @@ -45,7 +45,7 @@ PRIntn debug_mode; static void clientThreadFunc(void *arg) { - PRUintn port = (PRUintn) arg; + PRUintn port = (PRUintn)(uintptr_t)arg; PRFileDesc *sock; PRNetAddr addr; char buf[128]; @@ -169,7 +169,7 @@ int main(int argc, char **argv) } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort1, + clientThreadFunc, (void *)(uintptr_t)listenPort1, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { @@ -179,7 +179,7 @@ int main(int argc, char **argv) } clientThread = PR_CreateThread(PR_USER_THREAD, - clientThreadFunc, (void *) listenPort2, + clientThreadFunc, (void *)(uintptr_t)listenPort2, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); if (clientThread == NULL) { --- pr/tests/select2.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/select2.c @@ -53,6 +53,7 @@ PRInt32 count; ** ***********************************************************************/ +static int exitcode = 2; static void Test_Result (int result) { @@ -60,9 +61,13 @@ static void Test_Result (int result) { case PASS: printf ("PASS\n"); + if (exitcode == 2) { + exitcode = 0; + } break; case FAIL: printf ("FAIL\n"); + exitcode = 1; break; default: printf ("NOSTATUS\n"); @@ -382,4 +387,5 @@ int main(int argc, char **argv) PR_Cleanup(); + return exitcode; } --- pr/tests/semaerr.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/semaerr.c @@ -72,7 +72,7 @@ int main(int argc, char **argv) exit(1); } if (PR_GetError() != PR_FILE_NOT_FOUND_ERROR) { - fprintf(stderr, "Expected error is %d but got (%d, %d)\n", + fprintf(stderr, "Expected error is %ld (PR_FILE_NOT_FOUND_ERROR) but got (%d, %d)\n", PR_FILE_NOT_FOUND_ERROR, PR_GetError(), PR_GetOSError()); exit(1); } --- pr/tests/semaerr1.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/semaerr1.c @@ -83,7 +83,7 @@ int main(int argc, char **argv) exit(1); } if (PR_GetError() != PR_FILE_EXISTS_ERROR) { - fprintf(stderr, "Expect %d but got %d\n", PR_FILE_EXISTS_ERROR, + fprintf(stderr, "Expected %ld (PR_FILE_EXISTS_ERROR) but got %d\n", PR_FILE_EXISTS_ERROR, PR_GetError()); exit(1); } --- pr/tests/sendzlf.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/sendzlf.c @@ -26,7 +26,7 @@ static void ClientThread(void *arg) { PRFileDesc *sock; PRNetAddr addr; - PRUint16 port = (PRUint16) arg; + PRUint16 port = (PRUint16)(uintptr_t)arg; char buf[1024]; char *bufPtr; PRInt32 nbytes; @@ -184,7 +184,7 @@ int main(int argc, char **argv) } clientThread = PR_CreateThread(PR_USER_THREAD, - ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)), + ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)), PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { fprintf(stderr, "PR_CreateThread failed\n"); --- pr/tests/server_test.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/server_test.c @@ -61,7 +61,7 @@ PRCondVar *ServerStateCV; #ifdef DEBUGPRINTS #define DPRINTF printf #else -#define DPRINTF +#define DPRINTF(...) #endif @@ -582,6 +582,7 @@ static void do_workUU(void) do_work(); } +#if 0 static void do_workUK(void) { ServerScope = PR_LOCAL_THREAD; @@ -602,6 +603,7 @@ static void do_workKK(void) ClientScope = PR_GLOBAL_THREAD; do_work(); } +#endif static void Measure(void (*func)(void), const char *msg) --- pr/tests/servr_kk.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/servr_kk.c @@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; #ifdef DEBUGPRINTS #define DPRINTF printf #else -#define DPRINTF +#define DPRINTF(...) #endif PRIntn failed_already=0; @@ -539,6 +539,7 @@ void do_work() PR_JoinThread(ServerThread); } +#if 0 static void do_workUU(void) { ServerScope = PR_LOCAL_THREAD; @@ -559,6 +560,7 @@ static void do_workKU(void) ClientScope = PR_LOCAL_THREAD; do_work(); } +#endif static void do_workKK(void) { --- pr/tests/servr_ku.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/servr_ku.c @@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; #ifdef DEBUGPRINTS #define DPRINTF printf #else -#define DPRINTF +#define DPRINTF(...) #endif PRIntn failed_already=0; --- pr/tests/servr_uk.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/servr_uk.c @@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; #ifdef DEBUGPRINTS #define DPRINTF printf #else -#define DPRINTF +#define DPRINTF(...) #endif PRIntn failed_already=0; --- pr/tests/servr_uu.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/servr_uu.c @@ -57,7 +57,7 @@ PRCondVar *ServerStateCV; #ifdef DEBUGPRINTS #define DPRINTF printf #else -#define DPRINTF +#define DPRINTF(...) #endif PRIntn failed_already=0; --- pr/tests/short_thread.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/short_thread.c @@ -45,7 +45,7 @@ int main (int argc, char **argv) PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0)) == NULL ) { fprintf(stderr, - "simple_test: Error - PR_CreateThread failed: (%ld, %ld)\n", + "simple_test: Error - PR_CreateThread failed: (%d, %d)\n", PR_GetError(), PR_GetOSError()); exit( 1 ); } --- pr/tests/socket.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/socket.c @@ -173,7 +173,9 @@ readn(PRFileDesc *sockfd, char *buf, int int rem; int bytes; int offset = 0; +#ifdef WINNT int err; +#endif PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT; if (test_cancelio) { @@ -181,12 +183,14 @@ readn(PRFileDesc *sockfd, char *buf, int } for (rem=len; rem; offset += bytes, rem -= bytes) { - DPRINTF(("thread = 0x%lx: calling PR_Recv, bytes = %d\n", + DPRINTF(("thread = %p: calling PR_Recv, bytes = %d\n", PR_GetCurrentThread(), rem)); +#ifdef WINNT retry: +#endif bytes = PR_Recv(sockfd, buf + offset, rem, 0, timeout); - DPRINTF(("thread = 0x%lx: returning from PR_Recv, bytes = %d\n", + DPRINTF(("thread = %p: returning from PR_Recv, bytes = %d\n", PR_GetCurrentThread(), bytes)); if (bytes < 0) { #ifdef WINNT @@ -218,11 +222,11 @@ writen(PRFileDesc *sockfd, char *buf, in int offset = 0; for (rem=len; rem; offset += bytes, rem -= bytes) { - DPRINTF(("thread = 0x%lx: calling PR_Send, bytes = %d\n", + DPRINTF(("thread = %p: calling PR_Send, bytes = %d\n", PR_GetCurrentThread(), rem)); bytes = PR_Send(sockfd, buf + offset, rem, 0, PR_INTERVAL_NO_TIMEOUT); - DPRINTF(("thread = 0x%lx: returning from PR_Send, bytes = %d\n", + DPRINTF(("thread = %p: returning from PR_Send, bytes = %d\n", PR_GetCurrentThread(), bytes)); if (bytes <= 0) { return -1; @@ -272,7 +276,7 @@ Serve_Client(void *arg) if (PR_Shutdown(sockfd, PR_SHUTDOWN_RCV) < 0) { fprintf(stderr,"prsocket_test: ERROR - PR_Shutdown\n"); } - DPRINTF(("Serve_Client [0x%lx]: inbuf[0] = 0x%lx\n",PR_GetCurrentThread(), + DPRINTF(("Serve_Client [%p]: inbuf[0] = %d\n",PR_GetCurrentThread(), (*((int *) in_buf->data)))); if (writen(sockfd, in_buf->data, bytes) < bytes) { fprintf(stderr,"prsocket_test: ERROR - Serve_Client:writen\n"); @@ -414,7 +418,7 @@ TCP_Server(void *arg) goto exit; } - DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", + DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); if (PR_SetNetAddr(PR_IpAddrLoopback, client_domain, PR_ntohs(PR_NetAddrInetPort(&netaddr)), @@ -466,7 +470,7 @@ TCP_Server(void *arg) failed_already=1; goto exit; } - DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", t)); + DPRINTF(("TCP_Server: Created Serve_Client = %p\n", t)); } exit: @@ -482,7 +486,7 @@ exit: --(*sp->exit_counter); PR_Notify(sp->exit_mon); PR_ExitMonitor(sp->exit_mon); - DPRINTF(("TCP_Server [0x%lx] exiting\n", PR_GetCurrentThread())); + DPRINTF(("TCP_Server [%p] exiting\n", PR_GetCurrentThread())); } /* @@ -541,7 +545,7 @@ UDP_Server(void *arg) return; } - DPRINTF(("PR_Bind: UDP Server netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", + DPRINTF(("PR_Bind: UDP Server netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); /* * We can't use the IP address returned by PR_GetSockName in @@ -579,13 +583,13 @@ UDP_Server(void *arg) */ memset(&netaddr, 0, sizeof(netaddr)); for (i = 0; i < (num_udp_clients * num_udp_datagrams_per_client); i++) { - DPRINTF(("UDP_Server: calling PR_RecvFrom client - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n", + DPRINTF(("UDP_Server: calling PR_RecvFrom client - ip = 0x%x, port = %d bytes = %d inbuf = %p, inbuf[0] = 0x%x\n", netaddr.inet.ip, netaddr.inet.port, bytes, in_buf->data, in_buf->data[0])); rv = PR_RecvFrom(sockfd, in_buf->data, bytes, 0, &netaddr, PR_INTERVAL_NO_TIMEOUT); - DPRINTF(("UDP_Server: PR_RecvFrom client - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n", + DPRINTF(("UDP_Server: PR_RecvFrom client - ip = 0x%x, port = %d bytes = %d inbuf = %p, inbuf[0] = 0x%x\n", netaddr.inet.ip, netaddr.inet.port, rv, in_buf->data, in_buf->data[0])); if (rv != bytes) { @@ -608,7 +612,7 @@ UDP_Server(void *arg) --(*sp->exit_counter); PR_Notify(sp->exit_mon); PR_ExitMonitor(sp->exit_mon); - DPRINTF(("UDP_Server [0x%x] exiting\n", PR_GetCurrentThread())); + DPRINTF(("UDP_Server [%p] exiting\n", PR_GetCurrentThread())); } /* @@ -652,7 +656,7 @@ TCP_Client(void *arg) } if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0) { fprintf(stderr, "PR_Connect failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; return; } @@ -660,7 +664,7 @@ TCP_Client(void *arg) /* * fill in random data */ - memset(out_buf->data, ((PRInt32) (&netaddr)) + i + j, bytes); + memset(out_buf->data, ((intptr_t)(&netaddr)) + i + j, bytes); /* * write to server */ @@ -674,7 +678,7 @@ TCP_Client(void *arg) failed_already=1; return; } - DPRINTF(("TCP Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n", + DPRINTF(("TCP Client [%p]: out_buf = %p out_buf[0] = 0x%x\n", PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data)))); if (readn(sockfd, in_buf->data, bytes) < bytes) { fprintf(stderr,"prsocket_test: ERROR - TCP_Client:readn\n"); @@ -711,7 +715,7 @@ TCP_Client(void *arg) --(*cp->exit_counter); PR_Notify(cp->exit_mon); PR_ExitMonitor(cp->exit_mon); - DPRINTF(("TCP_Client [0x%x] exiting\n", PR_GetCurrentThread())); + DPRINTF(("TCP_Client [%p] exiting\n", PR_GetCurrentThread())); } /* @@ -775,7 +779,7 @@ UDP_Client(void *arg) return; } - DPRINTF(("PR_Bind: UDP Client netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", + DPRINTF(("PR_Bind: UDP Client netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); netaddr = cp->server_addr; @@ -792,9 +796,9 @@ UDP_Client(void *arg) /* * fill in random data */ - DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx bytes = 0x%lx\n", + DPRINTF(("UDP_Client [%p]: out_buf = %p bytes = %d\n", PR_GetCurrentThread(), out_buf->data, bytes)); - memset(out_buf->data, ((PRInt32) (&netaddr)) + i, bytes); + memset(out_buf->data, ((intptr_t)(&netaddr)) + i, bytes); /* * write to server */ @@ -807,7 +811,7 @@ UDP_Client(void *arg) if (rv != bytes) { return; } - DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n", + DPRINTF(("UDP_Client [%p]: out_buf = %p out_buf[0] = 0x%x\n", PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data)))); if (cp->udp_connect) rv = PR_Recv(sockfd, in_buf->data, bytes, 0, @@ -818,7 +822,7 @@ UDP_Client(void *arg) if (rv != bytes) { return; } - DPRINTF(("UDP_Client [0x%lx]: in_buf = 0x%lx in_buf[0] = 0x%lx\n", + DPRINTF(("UDP_Client [%p]: in_buf = %p in_buf[0] = 0x%x\n", PR_GetCurrentThread(), in_buf, (*((int *) in_buf->data)))); /* * verify the data read @@ -843,7 +847,7 @@ UDP_Client(void *arg) PR_Notify(cp->exit_mon); PR_ExitMonitor(cp->exit_mon); PR_DELETE(cp); - DPRINTF(("UDP_Client [0x%x] exiting\n", PR_GetCurrentThread())); + DPRINTF(("UDP_Client [%p] exiting\n", PR_GetCurrentThread())); } /* @@ -910,7 +914,7 @@ TCP_Socket_Client_Server_Test(void) failed_already=1; return -1; } - DPRINTF(("Created TCP server = 0x%lx\n", t)); + DPRINTF(("Created TCP server = %p\n", t)); thread_count++; /* @@ -944,7 +948,7 @@ TCP_Socket_Client_Server_Test(void) failed_already=1; return -1; } - DPRINTF(("Created TCP client = 0x%lx\n", t)); + DPRINTF(("Created TCP client = %p\n", t)); thread_count++; } /* Wait for server and client threads to exit */ @@ -954,9 +958,9 @@ TCP_Socket_Client_Server_Test(void) } PR_ExitMonitor(mon2); printf("%30s","TCP_Socket_Client_Server_Test:"); - printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l, + printf(" 1 Server %2d Clients %2d connections_per_client\n", num_tcp_clients, num_tcp_connections_per_client); - printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":", + printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":", num_tcp_mesgs_per_connection, tcp_mesg_size); return 0; @@ -1081,8 +1085,8 @@ UDP_Socket_Client_Server_Test(void) } PR_ExitMonitor(mon2); printf("%30s","UDP_Socket_Client_Server_Test: "); - printf("%2ld Server %2ld Clients\n",1l, num_udp_clients); - printf("%30s %2ld datagrams_per_client %4ld bytes_per_datagram\n",":", + printf(" 1 Server %2d Clients\n", num_udp_clients); + printf("%30s %2d datagrams_per_client %4d bytes_per_datagram\n",":", num_udp_datagrams_per_client, udp_datagram_size); return 0; @@ -1438,7 +1442,7 @@ TransmitFile_Client(void *arg) --(*cp->exit_counter); PR_Notify(cp->exit_mon); PR_ExitMonitor(cp->exit_mon); - DPRINTF(("TransmitFile_Client [0x%lx] exiting\n", PR_GetCurrentThread())); + DPRINTF(("TransmitFile_Client [%p] exiting\n", PR_GetCurrentThread())); } /* @@ -1481,7 +1485,7 @@ Serve_TransmitFile_Client(void *arg) if (bytes != (SMALL_FILE_SIZE+ SMALL_FILE_HEADER_SIZE)) { fprintf(stderr, "prsocet_test: PR_TransmitFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } bytes = PR_TransmitFile(sockfd, local_large_file_fd, NULL, 0, @@ -1489,7 +1493,7 @@ Serve_TransmitFile_Client(void *arg) if (bytes != LARGE_FILE_SIZE) { fprintf(stderr, "prsocket_test: PR_TransmitFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } @@ -1517,7 +1521,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } @@ -1541,7 +1545,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } /* @@ -1563,7 +1567,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } /* @@ -1585,7 +1589,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } /* @@ -1607,7 +1611,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } /* @@ -1629,7 +1633,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } /* @@ -1651,7 +1655,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } /* @@ -1675,7 +1679,7 @@ Serve_TransmitFile_Client(void *arg) slen, bytes); fprintf(stderr, "prsocket_test: PR_SendFile failed: (%ld, %ld)\n", - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } done: @@ -1752,7 +1756,7 @@ TransmitFile_Server(void *arg) goto exit; } - DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", + DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); tcp_server_addr.inet.family = netaddr.inet.family; tcp_server_addr.inet.port = netaddr.inet.port; @@ -1818,7 +1822,7 @@ TransmitFile_Server(void *arg) failed_already=1; goto exit; } - DPRINTF(("TransmitFile_Server: Created Serve_TransmitFile_Client = 0x%lx\n", t)); + DPRINTF(("TransmitFile_Server: Created Serve_TransmitFile_Client = %p\n", t)); } /* @@ -1846,7 +1850,7 @@ exit: --(*sp->exit_counter); PR_Notify(sp->exit_mon); PR_ExitMonitor(sp->exit_mon); - DPRINTF(("TransmitFile_Server [0x%lx] exiting\n", PR_GetCurrentThread())); + DPRINTF(("TransmitFile_Server [%p] exiting\n", PR_GetCurrentThread())); } /* @@ -1986,7 +1990,7 @@ Socket_Misc_Test(void) fprintf(stderr, "prsocket_test failed to write to file %s: (%ld, %ld)\n", LARGE_FILE_NAME, - PR_GetError(), PR_GetOSError()); + (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; rv = -1; goto done; @@ -2076,7 +2080,7 @@ Socket_Misc_Test(void) rv = -1; goto done; } - DPRINTF(("Created TCP server = 0x%x\n", t)); + DPRINTF(("Created TCP server = %p\n", t)); thread_count++; /* @@ -2113,7 +2117,7 @@ Socket_Misc_Test(void) failed_already=1; goto done; } - DPRINTF(("Created TransmitFile client = 0x%lx\n", t)); + DPRINTF(("Created TransmitFile client = %p\n", t)); thread_count++; } /* Wait for server and client threads to exit */ @@ -2144,7 +2148,7 @@ done: } if ((PR_RmDir(TEST_DIR)) == PR_FAILURE) { fprintf(stderr,"prsocket_test failed to rmdir %s: (%ld, %ld)\n", - TEST_DIR, PR_GetError(), PR_GetOSError()); + TEST_DIR, (long)PR_GetError(), (long)PR_GetOSError()); failed_already=1; } --- pr/tests/sprintf.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/sprintf.c @@ -133,7 +133,7 @@ static void test_l(char *pattern, char * (strncmp(s, sbuf, sizeof(sbuf)) != 0)) { fprintf(stderr, "pattern='%s' l=%ld\nPR_smprintf='%s'\nPR_snprintf='%s'\n sprintf='%s'\n", - pattern, l, s, buf, sbuf); + pattern, (long)l, s, buf, sbuf); PR_smprintf_free(s); exit(-1); } --- pr/tests/stack.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/stack.c @@ -53,7 +53,7 @@ PRFileDesc *errhandle; int main(int argc, char **argv) { - PRInt32 rv, cnt, sum; + PRInt32 cnt, sum; DataRecord *Item; PRStack *list1, *list2; PRStackElem *node; @@ -211,7 +211,7 @@ int main(int argc, char **argv) static void stackop(void *thread_arg) { PRInt32 val, cnt, index, loops; - DataRecord *Items, *Item; + DataRecord *Items; PRStack *list1, *list2; PRStackElem *node; stack_data *arg = (stack_data *) thread_arg; --- pr/tests/suspend.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/suspend.c @@ -21,14 +21,14 @@ void PR_CALLBACK Level_2_Thread(void *arg) { PR_Sleep(PR_MillisecondsToInterval(4 * 1000)); - printf("Level_2_Thread[0x%lx] exiting\n",PR_GetCurrentThread()); + printf("Level_2_Thread[%p] exiting\n",PR_GetCurrentThread()); return; } void PR_CALLBACK Level_1_Thread(void *arg) { - PRUint32 tmp = (PRUint32)arg; + PRUint32 tmp = (PRUint32)(uintptr_t)arg; PRThreadScope scope = (PRThreadScope) tmp; PRThread *thr; @@ -43,7 +43,7 @@ Level_1_Thread(void *arg) if (!thr) { printf("Could not create thread!\n"); } else { - printf("Level_1_Thread[0x%lx] created %15s thread 0x%lx\n", + printf("Level_1_Thread[%p] created %15s thread %p\n", PR_GetCurrentThread(), (scope == PR_GLOBAL_THREAD) ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", @@ -54,7 +54,7 @@ Level_1_Thread(void *arg) alive--; PR_Notify(mon); PR_ExitMonitor(mon); - printf("Thread[0x%lx] exiting\n",PR_GetCurrentThread()); + printf("Thread[%p] exiting\n",PR_GetCurrentThread()); } static PRStatus PR_CALLBACK print_thread(PRThread *thread, int i, void *arg) @@ -63,14 +63,15 @@ static PRStatus PR_CALLBACK print_thread PRWord *registers; printf( - "\nprint_thread[0x%lx]: %-20s - i = %ld\n",thread, + "\nprint_thread[%p]: %-20s - i = %ld\n",thread, (PR_GLOBAL_THREAD == PR_GetThreadScope(thread)) ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", i); registers = PR_GetGCRegisters(thread, 0, (int *)&words); if (registers) - printf("Registers R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n", - registers[0],registers[1],registers[2],registers[3]); - printf("Stack Pointer = 0x%lx\n", PR_GetSP(thread)); + printf("Regsters R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n", + (unsigned long)registers[0], (unsigned long)registers[1], + (unsigned long)registers[2], (unsigned long)registers[3]); + printf("Stack Pointer = %p\n", PR_GetSP(thread)); return PR_SUCCESS; } @@ -98,7 +99,7 @@ static void Level_0_Thread(PRThreadScope printf("Could not create thread!\n"); alive--; } - printf("Level_0_Thread[0x%lx] created %15s thread 0x%lx\n", + printf("Level_0_Thread[%p] created %15s thread %p\n", PR_GetCurrentThread(), (scope1 == PR_GLOBAL_THREAD) ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", @@ -110,9 +111,10 @@ static void Level_0_Thread(PRThreadScope PR_EnumerateThreads(print_thread, NULL); registers = PR_GetGCRegisters(me, 1, (int *)&words); if (registers) - printf("My Registers: R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n", - registers[0],registers[1],registers[2],registers[3]); - printf("My Stack Pointer = 0x%lx\n", PR_GetSP(me)); + printf("My Registers: R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n", + (unsigned long)registers[0], (unsigned long)registers[1], + (unsigned long)registers[2], (unsigned long)registers[3]); + printf("My Stack Pointer = %p\n", PR_GetSP(me)); PR_ResumeAll(); /* Wait for all threads to exit */ --- pr/tests/switch.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/switch.c @@ -83,7 +83,7 @@ PRIntn PR_CALLBACK Switch(PRIntn argc, c PRStatus status; PRBool help = PR_FALSE; PRUintn concurrency = 1; - Shared *shared, *link; + Shared *shared = NULL, *link; PRIntervalTime timein, timeout; PRThreadScope thread_scope = PR_LOCAL_THREAD; PRUintn thread_count, inner_count, loop_count, average; --- pr/tests/testfile.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/testfile.c @@ -37,6 +37,9 @@ static int _debug_on = 0; #ifdef XP_WIN #define mode_t int #endif +#if defined(XP_UNIX) || defined(XP_OS2_EMX) +# include /* getopt(3) */ +#endif #define DPRINTF(arg) if (_debug_on) printf arg @@ -90,7 +93,7 @@ static PRInt32 PR_CALLBACK DirTest(void PRInt32 dirtest_failed = 0; PRThread* create_new_thread(PRThreadType type, - void (*start)(void *arg), + void *(*start)(void *arg), void *arg, PRThreadPriority priority, PRThreadScope scope, @@ -155,7 +158,7 @@ PRThread* create_new_thread(PRThreadType return((PRThread *) thandle); #endif } else { - return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize)); + return(PR_CreateThread(type,(void (*)(void*))start,arg,priority,scope,state,stackSize)); } #else return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize)); @@ -316,8 +319,8 @@ static PRInt32 Misc_File_Tests(char *pat printf( "testfile PR_GetFileInfo returned incorrect status-change time: %s\n", pathname); - printf("ft = %lld, ft1 = %lld\n",file_info.creationTime, - file_info1.creationTime); + printf("ft = %lld, ft1 = %lld\n", (long long)file_info.creationTime, + (long long)file_info1.creationTime); rv = -1; goto cleanup; } @@ -342,8 +345,8 @@ static PRInt32 Misc_File_Tests(char *pat printf( "testfile PR_GetFileInfo returned incorrect modify time: %s\n", pathname); - printf("ft = %lld, ft1 = %lld\n",file_info.modifyTime, - file_info1.modifyTime); + printf("ft = %lld, ft1 = %lld\n", (long long)file_info.modifyTime, + (long long)file_info1.modifyTime); rv = -1; goto cleanup; } @@ -469,7 +472,7 @@ static PRInt32 PR_CALLBACK FileTest(void memset(fparamp->buf, i, len); t = create_new_thread(PR_USER_THREAD, - File_Write, (void *)fparamp, + (void *(*)(void *))File_Write, (void *)fparamp, PR_PRIORITY_NORMAL, scope, PR_UNJOINABLE_THREAD, @@ -504,7 +507,7 @@ static PRInt32 PR_CALLBACK FileTest(void fparamp->len = len; t = create_new_thread(PR_USER_THREAD, - File_Read, (void *)fparamp, + (void *(*)(void *))File_Read, (void *)fparamp, PR_PRIORITY_NORMAL, scope, PR_UNJOINABLE_THREAD, @@ -573,7 +576,7 @@ static PRInt32 RunDirTest(void) thrarg.done= 0; t = create_new_thread(PR_USER_THREAD, - DirTest, &thrarg, + (void *(*)(void *))DirTest, &thrarg, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, @@ -897,8 +900,6 @@ int main(int argc, char **argv) #endif #if defined(XP_UNIX) || defined(XP_OS2) int opt; - extern char *optarg; - extern int optind; #endif #if defined(XP_UNIX) || defined(XP_OS2) while ((opt = getopt(argc, argv, "d")) != EOF) { --- pr/tests/threads.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/threads.c @@ -27,7 +27,7 @@ void PR_CALLBACK DumbThread(void *arg) { - PRInt32 tmp = (PRInt32)arg; + PRInt32 tmp = (PRInt32)(intptr_t)arg; PRThreadScope scope = (PRThreadScope)tmp; PRThread *thr; @@ -173,10 +173,10 @@ int main(int argc, char **argv) if (debug_mode) { - printf("\ -** Tests lots of thread creations. \n\ -** Create %ld native threads %ld times. \n\ -** Create %ld user threads %ld times \n", iterations,count,iterations,count); + printf("** Tests lots of thread creations.\n" + "** Create %d native threads %d times.\n" + "** Create %d user threads %d times.\n", iterations, count, + iterations, count); } for (index=0; indexdata, ((PRInt32) (&netaddr)) + i + j, bytes); + memset(out_buf->data, ((intptr_t)(&netaddr)) + i + j, bytes); /* * write to server */ @@ -282,7 +282,7 @@ TCP_Socket_Client_Server_Test(void) PR_EnterMonitor(mon2); connections++; PR_ExitMonitor(mon2); - DPRINTF(("Created TCP client = 0x%lx\n", thr)); + DPRINTF(("Created TCP client = %p\n", thr)); } /* Wait for client jobs to exit */ PR_EnterMonitor(mon2); @@ -292,9 +292,9 @@ TCP_Socket_Client_Server_Test(void) } PR_ExitMonitor(mon2); printf("%30s","TCP_Socket_Client_Server_Test:"); - printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l, + printf(" 1 Server %2d Clients %2d connections_per_client\n", num_tcp_clients, num_tcp_connections_per_client); - printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":", + printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":", num_tcp_mesgs_per_connection, tcp_mesg_size); PR_DELETE(cparamp); --- pr/tests/thrpool_server.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/thrpool_server.c @@ -330,7 +330,7 @@ TCP_Server(void *arg) } DPRINTF(( - "TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n", + "TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n", netaddr.inet.ip, netaddr.inet.port)); sp = PR_NEW(Server_Param); @@ -342,7 +342,7 @@ TCP_Server(void *arg) sp->iod.socket = sockfd; sp->iod.timeout = PR_SecondsToInterval(60); sp->datalen = tcp_mesg_size; - sp->exit_mon = sc_mon; + sp->exit_mon = NULL; sp->job_counterp = &job_counter; sp->conn_counter = 0; sp->tp = tp; @@ -465,7 +465,7 @@ TCP_Server_Accept(void *arg) PR_FALSE); PR_ASSERT(NULL != jobp); - DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", jobp)); + DPRINTF(("TCP_Server: Created Serve_Client = %p\n", jobp)); /* * single-threaded update; no lock needed @@ -482,7 +482,7 @@ TCP_Server_Accept(void *arg) print_stats, sp, PR_FALSE); PR_ASSERT(NULL != jobp); - DPRINTF(("TCP_Server: Created print_stats timer job = 0x%lx\n", jobp)); + DPRINTF(("TCP_Server: Created print_stats timer job = %p\n", jobp)); exit: PR_EnterMonitor(sp->exit_mon); @@ -499,9 +499,9 @@ exit: } PR_DestroyMonitor(sp->exit_mon); printf("%30s","TCP_Socket_Client_Server_Test:"); - printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l, + printf(" 1 Server %2d Clients %2d connections_per_client\n", num_tcp_clients, num_tcp_connections_per_client); - printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":", + printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":", num_tcp_mesgs_per_connection, tcp_mesg_size); DPRINTF(("%s: calling PR_ShutdownThreadPool\n", program_name)); --- pr/tests/thruput.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/thruput.c @@ -82,7 +82,7 @@ static void PR_CALLBACK Clientel(void *a { PRStatus rv; PRFileDesc *xport; - PRInt32 bytes, sampled; + PRInt32 bytes, sampled = -1; PRIntervalTime now, interval; PRBool do_display = PR_FALSE; Shared *shared = (Shared*)arg; @@ -196,7 +196,7 @@ static void Client(const char *server_na static void PR_CALLBACK Servette(void *arg) { - PRInt32 bytes, sampled; + PRInt32 bytes, sampled = -1; PRIntervalTime now, interval; PRBool do_display = PR_FALSE; PRFileDesc *client = (PRFileDesc*)arg; @@ -408,6 +408,7 @@ int main(int argc, char **argv) } return 0; + return 0; } /* main */ /* thruput.c */ --- pr/tests/timemac.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/timemac.c @@ -25,7 +25,7 @@ static void printExplodedTime(const PREx const char *sign; /* Print day of the week, month, day, hour, minute, and second */ - printf( "%s %s %ld %02ld:%02ld:%02ld ", + printf( "%s %s %d %02d:%02d:%02d ", dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, et->tm_hour, et->tm_min, et->tm_sec); @@ -41,7 +41,7 @@ static void printExplodedTime(const PREx } hourOffset = totalOffset / 3600; minOffset = (totalOffset % 3600) / 60; - printf("%s%02ld%02ld ", sign, hourOffset, minOffset); + printf("%s%02d%02d ", sign, hourOffset, minOffset); } /* Print year */ @@ -98,7 +98,7 @@ int main(int argc, char** argv) printf("Current local time is "); printExplodedTime(&et); printf("\n"); - printf("GMT offset is %ld, DST offset is %ld\n", + printf("GMT offset is %d, DST offset is %d\n", et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset); t2 = PR_ImplodeTime(&et); if (LL_NE(t1, t2)) { --- pr/tests/timetest.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/timetest.c @@ -37,7 +37,7 @@ static void PrintExplodedTime(const PREx const char *sign; /* Print day of the week, month, day, hour, minute, and second */ - if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ", + if (debug_mode) printf("%s %s %d %02d:%02d:%02d ", dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, et->tm_hour, et->tm_min, et->tm_sec); @@ -56,7 +56,7 @@ static void PrintExplodedTime(const PREx hourOffset = totalOffset / 3600; minOffset = (totalOffset % 3600) / 60; if (debug_mode) { - printf("%s%02ld%02ld ", sign, hourOffset, minOffset); + printf("%s%02d%02d ", sign, hourOffset, minOffset); } } @@ -262,7 +262,7 @@ int main(int argc, char** argv) if (debug_mode) { printf("\n"); } - if (debug_mode) printf("GMT offset is %ld, DST offset is %ld\n", + if (debug_mode) printf("GMT offset is %d, DST offset is %d\n", et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset); t2 = PR_ImplodeTime(&et); if (LL_NE(t1, t2)) { --- pr/tests/y2k.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/y2k.c @@ -44,7 +44,7 @@ static void PrintExplodedTime(const PREx const char *sign; /* Print day of the week, month, day, hour, minute, and second */ - printf("%s %s %2ld %02ld:%02ld:%02ld ", + printf("%s %s %2d %02d:%02d:%02d ", dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday, et->tm_hour, et->tm_min, et->tm_sec); @@ -63,7 +63,7 @@ static void PrintExplodedTime(const PREx } hourOffset = totalOffset / 3600; minOffset = (totalOffset % 3600) / 60; - printf("%s%02ld%02ld ", sign, hourOffset, minOffset); + printf("%s%02d%02d ", sign, hourOffset, minOffset); } #ifdef PRINT_DETAILS printf("{%d, %d, %d, %d, %d, %d, %d, %d, %d, { %d, %d}}\n",et->tm_usec, --- pr/tests/y2ktmo.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/y2ktmo.c @@ -70,7 +70,7 @@ static struct _timeb start_time_tb; static void SleepThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); @@ -121,7 +121,7 @@ static void SleepThread(void *arg) static void AcceptThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); @@ -197,7 +197,7 @@ static void AcceptThread(void *arg) static void PollThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); @@ -276,7 +276,7 @@ static void PollThread(void *arg) static void WaitCondVarThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); @@ -340,7 +340,7 @@ static void WaitCondVarThread(void *arg) static void WaitMonitorThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); @@ -397,7 +397,7 @@ static void WaitMonitorThread(void *arg) static void WaitCMonitorThread(void *arg) { - PRIntervalTime timeout = (PRIntervalTime) arg; + PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg; PRIntervalTime elapsed; #if defined(XP_UNIX) || defined(WIN32) PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout); @@ -532,7 +532,7 @@ int main(int argc, char **argv) for (i = 0; i < num_thread_scopes; i++) { for (j = 0; j < num_thread_funcs; j++) { threads[idx] = PR_CreateThread(PR_USER_THREAD, threadFuncs[j], - (void*)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL, + (void*)(intptr_t)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL, threadScopes[i], PR_JOINABLE_THREAD, 0); if (threads[idx] == NULL) { fprintf(stderr, "PR_CreateThread failed\n"); --- pr/tests/zerolen.c.orig 2022-05-25 21:34:56 UTC +++ pr/tests/zerolen.c @@ -45,7 +45,7 @@ static void ClientThread(void *arg) { PRFileDesc *sock; PRNetAddr addr; - PRUint16 port = (PRUint16) arg; + PRUint16 port = (PRUint16)(uintptr_t)arg; char buf[1024]; PRInt32 nbytes; @@ -124,7 +124,7 @@ int main() * First test PR_Writev. */ clientThread = PR_CreateThread(PR_USER_THREAD, - ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)), + ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)), PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { fprintf(stderr, "PR_CreateThread failed\n"); @@ -165,7 +165,7 @@ int main() * Then test PR_Write. */ clientThread = PR_CreateThread(PR_USER_THREAD, - ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)), + ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)), PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { fprintf(stderr, "PR_CreateThread failed\n"); @@ -204,7 +204,7 @@ int main() * Finally test PR_Send. */ clientThread = PR_CreateThread(PR_USER_THREAD, - ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)), + ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)), PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); if (NULL == clientThread) { fprintf(stderr, "PR_CreateThread failed\n"); [FILE:1546:patches/patch-warnings] --- pr/include/prcountr.h.orig 2022-05-25 21:34:56 UTC +++ pr/include/prcountr.h @@ -394,7 +394,7 @@ PR_SubtractFromCounter( #define PR_GET_COUNTER(counter,handle)\ (counter) = PR_GetCounter((handle)) #else -#define PR_GET_COUNTER(counter,handle) 0 +#define PR_GET_COUNTER(counter,handle) #endif NSPR_API(PRUint32) @@ -468,7 +468,7 @@ PR_SetCounter( #define PR_FIND_NEXT_COUNTER_QNAME(next,handle)\ (next) = PR_FindNextCounterQname((handle)) #else -#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL +#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) #endif NSPR_API(PRCounterHandle) --- pr/src/misc/pralarm.c.orig 2022-05-25 21:34:56 UTC +++ pr/src/misc/pralarm.c @@ -101,7 +101,7 @@ static void PR_CALLBACK pr_alarmNotifier while (why != abort) { - PRIntervalTime pause; + PRIntervalTime pause = 0; PR_Lock(alarm->lock); while (why == scan) --- pr/src/misc/prdtoa.c.orig 2022-05-25 21:34:56 UTC +++ pr/src/misc/prdtoa.c @@ -2885,9 +2885,9 @@ double dd; int mode, ndigits, *decpt, *s to hold the suppressed trailing zeros. */ - int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1, - j, j1, k, k0, k_check, leftright, m2, m5, s2, s5, - spec_case, try_quick; + int bbits, b2, b5, be, dig, i, ieps, ilim = -1, ilim0, ilim1 = -1, + j, j1, k, k0, k_check, leftright, m2, m5, s2, s5, + spec_case, try_quick; Long L; #ifndef Sudden_Underflow int denorm;