Hello community,
here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at 2015-01-30 20:31:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozilla-nspr (Old)
and /work/SRC/openSUSE:Factory/.mozilla-nspr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-nspr"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozilla-nspr/mozilla-nspr.changes 2014-09-08 21:28:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-nspr.new/mozilla-nspr.changes 2015-01-30 20:31:42.000000000 +0100
@@ -1,0 +2,21 @@
+Thu Jan 29 09:06:29 UTC 2015 - wr(a)rosenauer.org
+
+- update to version 4.10.8
+ * bmo#573192: remove the stack-based PRFileDesc cache.
+ * bmo#756047: check for _POSIX_THREAD_PRIORITY_SCHEDULING > 0 instead
+ of only checking if the identifier is defined.
+ * bmo#782113: Add NSPR support for FreeBSD ppc/ppc64/arm.
+ * bmo#782124: Implement PR_GetPhysicalMemorySize on FreeBSD/DragonFly.
+ * bmo#1060292: Make PR_Assert() and PR_Abort() output visible in the
+ logcat on Android.
+ * bmo#1089908: Fix variable shadowing in _PR_MD_LOCKFILE. Use
+ PR_ARRAY_SIZE to get the array size of _PR_RUNQ(t->cpu).
+ * bmo#1105144: Two places in NSPR's pruthr.c cast a pointer to long,
+ which isn't correct on 64-bit Windows.
+ * bmo#1060401: change import library name under mingw.
+ * bmo#1106600: Replace PR_ASSERT(!"foo") with PR_NOT_REACHED("foo") t
+ fix clang -Wstring-conversion warnings.
+ * bmo#1107063: link NSPR libs with -soname on OpenBSD.
+ * bmo#1120772: Avoid defining snprintf when MSVC provides it.
+
+-------------------------------------------------------------------
Old:
----
nspr-4.10.7.tar.gz
New:
----
nspr-4.10.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nspr.spec ++++++
--- /var/tmp/diff_new_pack.6pGcGr/_old 2015-01-30 20:31:44.000000000 +0100
+++ /var/tmp/diff_new_pack.6pGcGr/_new 2015-01-30 20:31:44.000000000 +0100
@@ -1,8 +1,8 @@
#
# spec file for package mozilla-nspr
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# 2006-2014 Wolfgang Rosenauer
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# 2006-2015 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: mozilla-nspr
-Version: 4.10.7
+Version: 4.10.8
Release: 0
Summary: Netscape Portable Runtime
License: MPL-2.0
++++++ nspr-4.10.7.tar.gz -> nspr-4.10.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/.hg_archival.txt new/nspr-4.10.8/nspr/.hg_archival.txt
--- old/nspr-4.10.7/nspr/.hg_archival.txt 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/.hg_archival.txt 2015-01-22 21:44:59.000000000 +0100
@@ -1,4 +1,4 @@
repo: a4b34919bf34db2ee22acbbc305693c8980b6dc6
-node: 0f03651116c5b34ba48b5a5cd31234303d9806b6
+node: ad3ebb90bc9968055faadffb37233ad4cb956f85
branch: default
-tag: NSPR_4_10_7_RTM
+tag: NSPR_4_10_8_RTM
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/config/rules.mk new/nspr-4.10.8/nspr/config/rules.mk
--- old/nspr-4.10.7/nspr/config/rules.mk 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/config/rules.mk 2015-01-22 21:44:59.000000000 +0100
@@ -83,15 +83,19 @@
ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET)))
LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
else
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
endif
+ifdef MSC_VER
+IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
+else
+IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
+endif
+
else
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/configure new/nspr-4.10.8/nspr/configure
--- old/nspr-4.10.7/nspr/configure 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/configure 2015-01-22 21:44:59.000000000 +0100
@@ -2489,7 +2489,7 @@
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=10
-MOD_PATCH_VERSION=7
+MOD_PATCH_VERSION=8
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
@@ -7382,7 +7382,7 @@
if test -z "$USE_NSPR_THREADS"; then
USE_PTHREADS=1
fi
- DSO_LDOPTS='-shared -fPIC'
+ DSO_LDOPTS='-shared -fPIC -Wl,-soname,$(notdir $@)'
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/configure.in new/nspr-4.10.8/nspr/configure.in
--- old/nspr-4.10.7/nspr/configure.in 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/configure.in 2015-01-22 21:44:59.000000000 +0100
@@ -16,7 +16,7 @@
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=10
-MOD_PATCH_VERSION=7
+MOD_PATCH_VERSION=8
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
@@ -2178,7 +2178,7 @@
if test -z "$USE_NSPR_THREADS"; then
USE_PTHREADS=1
fi
- DSO_LDOPTS='-shared -fPIC'
+ DSO_LDOPTS='-shared -fPIC -Wl,-soname,$(notdir $@)'
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/include/md/_freebsd.cfg new/nspr-4.10.8/nspr/pr/include/md/_freebsd.cfg
--- old/nspr-4.10.7/nspr/pr/include/md/_freebsd.cfg 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/include/md/_freebsd.cfg 2015-01-22 21:44:59.000000000 +0100
@@ -251,6 +251,147 @@
#define PR_ALIGN_OF_POINTER 8
#define PR_ALIGN_OF_WORD 8
+#elif defined(__powerpc64__)
+
+#undef IS_LITTLE_ENDIAN
+#define IS_BIG_ENDIAN 1
+#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_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
+
+#define PR_BYTES_PER_WORD_LOG2 3
+#define PR_BYTES_PER_DWORD_LOG2 3
+
+#elif defined(__powerpc__)
+
+#undef IS_LITTLE_ENDIAN
+#define IS_BIG_ENDIAN 1
+
+#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_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 8
+#define PR_ALIGN_OF_FLOAT 4
+#define PR_ALIGN_OF_DOUBLE 8
+#define PR_ALIGN_OF_POINTER 4
+#define PR_ALIGN_OF_WORD 4
+
+#define PR_BYTES_PER_WORD_LOG2 2
+#define PR_BYTES_PER_DWORD_LOG2 3
+
+#elif defined(__arm__)
+
+#if defined(__ARMEB__) || defined(__ARM_BIG_ENDIAN__)
+#undef IS_LITTLE_ENDIAN
+#define IS_BIG_ENDIAN 1
+#else
+#undef IS_BIG_ENDIAN
+#define IS_LITTLE_ENDIAN 1
+#endif
+
+#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_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 8
+#define PR_ALIGN_OF_FLOAT 4
+#define PR_ALIGN_OF_DOUBLE 8
+#define PR_ALIGN_OF_POINTER 4
+#define PR_ALIGN_OF_WORD 4
+
+#define PR_BYTES_PER_WORD_LOG2 2
+#define PR_BYTES_PER_DWORD_LOG2 3
+
#else
#error "Unknown CPU architecture"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/include/md/_freebsd.h new/nspr-4.10.8/nspr/pr/include/md/_freebsd.h
--- old/nspr-4.10.7/nspr/pr/include/md/_freebsd.h 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/include/md/_freebsd.h 2015-01-22 21:44:59.000000000 +0100
@@ -25,6 +25,12 @@
#define _PR_SI_ARCHITECTURE "ia64"
#elif defined(__amd64__)
#define _PR_SI_ARCHITECTURE "amd64"
+#elif defined(__powerpc64__)
+#define _PR_SI_ARCHITECTURE "powerpc64"
+#elif defined(__powerpc__)
+#define _PR_SI_ARCHITECTURE "powerpc"
+#elif defined(__arm__)
+#define _PR_SI_ARCHITECTURE "arm"
#else
#error "Unknown CPU architecture"
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/include/prinit.h new/nspr-4.10.8/nspr/pr/include/prinit.h
--- old/nspr-4.10.7/nspr/pr/include/prinit.h 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/include/prinit.h 2015-01-22 21:44:59.000000000 +0100
@@ -31,10 +31,10 @@
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
-#define PR_VERSION "4.10.7"
+#define PR_VERSION "4.10.8"
#define PR_VMAJOR 4
#define PR_VMINOR 10
-#define PR_VPATCH 7
+#define PR_VPATCH 8
#define PR_BETA PR_FALSE
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/cplus/rcnetdb.cpp new/nspr-4.10.8/nspr/pr/src/cplus/rcnetdb.cpp
--- old/nspr-4.10.7/nspr/pr/src/cplus/rcnetdb.cpp 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/cplus/rcnetdb.cpp 2015-01-22 21:44:59.000000000 +0100
@@ -35,7 +35,7 @@
{
case RCNetAddr::any: how = PR_IpAddrAny; break;
case RCNetAddr::loopback: how = PR_IpAddrLoopback; break;
- default: PR_ASSERT(!"This can't happen -- and did!");
+ default: PR_NOT_REACHED("This can't happen -- and did!");
}
(void)PR_InitializeNetAddr(how, port, &address);
} /* RCNetAddr::RCNetAddr */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/io/prfdcach.c new/nspr-4.10.8/nspr/pr/src/io/prfdcach.c
--- old/nspr-4.10.7/nspr/pr/src/io/prfdcach.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/io/prfdcach.c 2015-01-22 21:44:59.000000000 +0100
@@ -31,13 +31,11 @@
{
PRLock *ml;
PRIntn count;
- PRStack *stack;
PRFileDesc *head, *tail;
PRIntn limit_low, limit_high;
} _PR_Fd_Cache;
static _PR_Fd_Cache _pr_fd_cache;
-static PRFileDesc **stack2fd = &(((PRFileDesc*)NULL)->higher);
/*
@@ -59,11 +57,7 @@
*/
if (0 == _pr_fd_cache.limit_high)
{
- PRStackElem *pop;
- PR_ASSERT(NULL != _pr_fd_cache.stack);
- pop = PR_StackPop(_pr_fd_cache.stack);
- if (NULL == pop) goto allocate;
- fd = (PRFileDesc*)((PRPtrdiff)pop - (PRPtrdiff)stack2fd);
+ goto allocate;
}
else
{
@@ -128,18 +122,9 @@
fd->identity = PR_INVALID_IO_LAYER;
fd->secret->state = _PR_FILEDESC_FREED;
- if (0 == _pr_fd_cache.limit_high)
- {
- PR_StackPush(_pr_fd_cache.stack, (PRStackElem*)(&fd->higher));
- }
- else
+ if (0 != _pr_fd_cache.limit_high)
{
- if (_pr_fd_cache.count > _pr_fd_cache.limit_high)
- {
- PR_Free(fd->secret);
- PR_Free(fd);
- }
- else
+ if (_pr_fd_cache.count < _pr_fd_cache.limit_high)
{
PR_Lock(_pr_fd_cache.ml);
if (NULL == _pr_fd_cache.tail)
@@ -157,8 +142,12 @@
fd->higher = NULL; /* always so */
_pr_fd_cache.count += 1; /* count the new entry */
PR_Unlock(_pr_fd_cache.ml);
+ return;
}
}
+
+ PR_Free(fd->secret);
+ PR_Free(fd);
} /* _PR_Putfd */
PR_IMPLEMENT(PRStatus) PR_SetFDCacheSize(PRIntn low, PRIntn high)
@@ -173,48 +162,8 @@
if (low > high) low = high; /* sanity check the params */
PR_Lock(_pr_fd_cache.ml);
- if (0 == high) /* shutting down or staying down */
- {
- if (0 != _pr_fd_cache.limit_high) /* shutting down */
- {
- _pr_fd_cache.limit_high = 0; /* stop use */
- /*
- ** Hold the lock throughout - nobody's going to want it
- ** other than another caller to this routine. Just don't
- ** let that happen.
- **
- ** Put all the cached fds onto the new cache.
- */
- while (NULL != _pr_fd_cache.head)
- {
- PRFileDesc *fd = _pr_fd_cache.head;
- _pr_fd_cache.head = fd->higher;
- PR_StackPush(_pr_fd_cache.stack, (PRStackElem*)(&fd->higher));
- }
- _pr_fd_cache.limit_low = 0;
- _pr_fd_cache.tail = NULL;
- _pr_fd_cache.count = 0;
- }
- }
- else /* starting up or just adjusting parameters */
- {
- PRBool was_using_stack = (0 == _pr_fd_cache.limit_high);
- _pr_fd_cache.limit_low = low;
- _pr_fd_cache.limit_high = high;
- if (was_using_stack) /* was using stack - feed into cache */
- {
- PRStackElem *pop;
- while (NULL != (pop = PR_StackPop(_pr_fd_cache.stack)))
- {
- PRFileDesc *fd = (PRFileDesc*)
- ((PRPtrdiff)pop - (PRPtrdiff)stack2fd);
- if (NULL == _pr_fd_cache.tail) _pr_fd_cache.tail = fd;
- fd->higher = _pr_fd_cache.head;
- _pr_fd_cache.head = fd;
- _pr_fd_cache.count += 1;
- }
- }
- }
+ _pr_fd_cache.limit_high = high;
+ _pr_fd_cache.limit_low = low;
PR_Unlock(_pr_fd_cache.ml);
return PR_SUCCESS;
} /* PR_SetFDCacheSize */
@@ -258,8 +207,6 @@
_pr_fd_cache.ml = PR_NewLock();
PR_ASSERT(NULL != _pr_fd_cache.ml);
- _pr_fd_cache.stack = PR_CreateStack("FD");
- PR_ASSERT(NULL != _pr_fd_cache.stack);
} /* _PR_InitFdCache */
@@ -279,14 +226,6 @@
_pr_fd_cache.count = 0;
PR_DestroyLock(_pr_fd_cache.ml);
_pr_fd_cache.ml = NULL;
- while ((pop = PR_StackPop(_pr_fd_cache.stack)) != NULL)
- {
- fd = (PRFileDesc*)((PRPtrdiff)pop - (PRPtrdiff)stack2fd);
- PR_DELETE(fd->secret);
- PR_DELETE(fd);
- }
- PR_DestroyStack(_pr_fd_cache.stack);
- _pr_fd_cache.stack = NULL;
} /* _PR_CleanupFdCache */
/* prfdcach.c */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/io/priometh.c new/nspr-4.10.8/nspr/pr/src/io/priometh.c
--- old/nspr-4.10.7/nspr/pr/src/io/priometh.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/io/priometh.c 2015-01-22 21:44:59.000000000 +0100
@@ -51,14 +51,14 @@
PRIntn _PR_InvalidInt(void)
{
- PR_ASSERT(!"I/O method is invalid");
+ PR_NOT_REACHED("I/O method is invalid");
PR_SetError(PR_INVALID_METHOD_ERROR, 0);
return -1;
} /* _PR_InvalidInt */
PRInt16 _PR_InvalidInt16(void)
{
- PR_ASSERT(!"I/O method is invalid");
+ PR_NOT_REACHED("I/O method is invalid");
PR_SetError(PR_INVALID_METHOD_ERROR, 0);
return -1;
} /* _PR_InvalidInt */
@@ -67,7 +67,7 @@
{
PRInt64 rv;
LL_I2L(rv, -1);
- PR_ASSERT(!"I/O method is invalid");
+ PR_NOT_REACHED("I/O method is invalid");
PR_SetError(PR_INVALID_METHOD_ERROR, 0);
return rv;
} /* _PR_InvalidInt */
@@ -78,7 +78,7 @@
PRStatus _PR_InvalidStatus(void)
{
- PR_ASSERT(!"I/O method is invalid");
+ PR_NOT_REACHED("I/O method is invalid");
PR_SetError(PR_INVALID_METHOD_ERROR, 0);
return PR_FAILURE;
} /* _PR_InvalidDesc */
@@ -89,7 +89,7 @@
PRFileDesc *_PR_InvalidDesc(void)
{
- PR_ASSERT(!"I/O method is invalid");
+ PR_NOT_REACHED("I/O method is invalid");
PR_SetError(PR_INVALID_METHOD_ERROR, 0);
return NULL;
} /* _PR_InvalidDesc */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/io/prlog.c new/nspr-4.10.8/nspr/pr/src/io/prlog.c
--- old/nspr-4.10.7/nspr/pr/src/io/prlog.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/io/prlog.c 2015-01-22 21:44:59.000000000 +0100
@@ -537,6 +537,9 @@
PR_IMPLEMENT(void) PR_Abort(void)
{
PR_LogPrint("Aborting");
+#ifdef ANDROID
+ __android_log_write(ANDROID_LOG_ERROR, "PRLog", "Aborting");
+#endif
abort();
}
@@ -547,9 +550,11 @@
fflush(stderr);
#ifdef WIN32
DebugBreak();
-#endif
-#ifdef XP_OS2
+#elif defined(XP_OS2)
asm("int $3");
+#elif defined(ANDROID)
+ __android_log_assert(NULL, "PRLog", "Assertion failure: %s, at %s:%d\n",
+ s, file, ln);
#endif
abort();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/io/prmwait.c new/nspr-4.10.8/nspr/pr/src/io/prmwait.c
--- old/nspr-4.10.7/nspr/pr/src/io/prmwait.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/io/prmwait.c 2015-01-22 21:44:59.000000000 +0100
@@ -658,7 +658,7 @@
if (closesocket(bottom->secret->md.osfd) == SOCKET_ERROR)
{
fprintf(stderr, "closesocket failed: %d\n", WSAGetLastError());
- PR_ASSERT(!"What shall I do?");
+ PR_NOT_REACHED("What shall I do?");
}
}
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/io/prprf.c new/nspr-4.10.8/nspr/pr/src/io/prprf.c
--- old/nspr-4.10.7/nspr/pr/src/io/prprf.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/io/prprf.c 2015-01-22 21:44:59.000000000 +0100
@@ -18,7 +18,7 @@
#include "prlog.h"
#include "prmem.h"
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/linking/prlink.c new/nspr-4.10.8/nspr/pr/src/linking/prlink.c
--- old/nspr-4.10.7/nspr/pr/src/linking/prlink.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/linking/prlink.c 2015-01-22 21:44:59.000000000 +0100
@@ -1036,7 +1036,7 @@
* fail (the library is not on the _pr_loadmap list),
* but don't wipe out an error from dlclose/shl_unload.
*/
- PR_ASSERT(!"_pr_loadmap and lib->refCount inconsistent");
+ PR_NOT_REACHED("_pr_loadmap and lib->refCount inconsistent");
if (result == 0) {
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
status = PR_FAILURE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/md/os2/os2thred.c new/nspr-4.10.8/nspr/pr/src/md/os2/os2thred.c
--- old/nspr-4.10.7/nspr/pr/src/md/os2/os2thred.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/md/os2/os2thred.c 2015-01-22 21:44:59.000000000 +0100
@@ -272,7 +272,7 @@
_PR_MD_SETTHREADAFFINITYMASK(PRThread *thread, PRUint32 mask )
{
/* Can we do this on OS/2? Only on SMP versions? */
- PR_ASSERT(!"Not implemented");
+ PR_NOT_REACHED("Not implemented");
return 0;
/* This is what windows does:
@@ -288,7 +288,7 @@
_PR_MD_GETTHREADAFFINITYMASK(PRThread *thread, PRUint32 *mask)
{
/* Can we do this on OS/2? Only on SMP versions? */
- PR_ASSERT(!"Not implemented");
+ PR_NOT_REACHED("Not implemented");
return 0;
/* This is what windows does:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/md/windows/w95io.c new/nspr-4.10.8/nspr/pr/src/md/windows/w95io.c
--- old/nspr-4.10.7/nspr/pr/src/md/windows/w95io.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/md/windows/w95io.c 2015-01-22 21:44:59.000000000 +0100
@@ -955,9 +955,10 @@
0l, 0l,
0x0l, 0xffffffffl );
if ( rv == 0 ) {
- DWORD rc = GetLastError();
+ DWORD err = GetLastError();
+ _PR_MD_MAP_DEFAULT_ERROR(err);
PR_LOG( _pr_io_lm, PR_LOG_ERROR,
- ("_PR_MD_LOCKFILE() failed. Error: %d", rc ));
+ ("_PR_MD_LOCKFILE() failed. Error: %d", err ));
rc = PR_FAILURE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/misc/prolock.c new/nspr-4.10.8/nspr/pr/src/misc/prolock.c
--- old/nspr-4.10.7/nspr/pr/src/misc/prolock.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/misc/prolock.c 2015-01-22 21:44:59.000000000 +0100
@@ -19,7 +19,7 @@
const char *name
)
{
- PR_ASSERT(!"Not implemented"); /* Not implemented yet */
+ PR_NOT_REACHED("Not implemented"); /* Not implemented yet */
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
return NULL;
} /* end PR_CreateOrderedLock() */
@@ -30,7 +30,7 @@
PROrderedLock *lock
)
{
- PR_ASSERT(!"Not implemented"); /* Not implemented yet */
+ PR_NOT_REACHED("Not implemented"); /* Not implemented yet */
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
} /* end PR_DestroyOrderedLock() */
@@ -40,7 +40,7 @@
PROrderedLock *lock
)
{
- PR_ASSERT(!"Not implemented"); /* Not implemented yet */
+ PR_NOT_REACHED("Not implemented"); /* Not implemented yet */
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
} /* end PR_LockOrderedLock() */
@@ -50,7 +50,7 @@
PROrderedLock *lock
)
{
- PR_ASSERT(!"Not implemented"); /* Not implemented yet */
+ PR_NOT_REACHED("Not implemented"); /* Not implemented yet */
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
return PR_FAILURE;
} /* end PR_UnlockOrderedLock() */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/misc/prsystem.c new/nspr-4.10.8/nspr/pr/src/misc/prsystem.c
--- old/nspr-4.10.7/nspr/pr/src/misc/prsystem.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/misc/prsystem.c 2015-01-22 21:44:59.000000000 +0100
@@ -24,7 +24,7 @@
/* BSD-derived systems use sysctl() to get the number of processors */
#if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
- || defined(OPENBSD) || defined(DARWIN)
+ || defined(OPENBSD) || defined(DRAGONFLY) || defined(DARWIN)
#define _PR_HAVE_SYSCTL
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -275,15 +275,24 @@
if (pageSize >= 0 && pageCount >= 0)
bytes = (PRUint64) pageSize * pageCount;
-#elif defined(NETBSD) || defined(OPENBSD)
+#elif defined(NETBSD) || defined(OPENBSD) \
+ || defined(FREEBSD) || defined(DRAGONFLY)
int mib[2];
int rc;
+#ifdef HW_PHYSMEM64
uint64_t memSize;
+#else
+ unsigned long memSize;
+#endif
size_t len = sizeof(memSize);
mib[0] = CTL_HW;
+#ifdef HW_PHYSMEM64
mib[1] = HW_PHYSMEM64;
+#else
+ mib[1] = HW_PHYSMEM;
+#endif
rc = sysctl(mib, 2, &memSize, &len, NULL, 0);
if (-1 != rc) {
bytes = memSize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/pthreads/ptthread.c new/nspr-4.10.8/nspr/pr/src/pthreads/ptthread.c
--- old/nspr-4.10.7/nspr/pr/src/pthreads/ptthread.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/pthreads/ptthread.c 2015-01-22 21:44:59.000000000 +0100
@@ -54,7 +54,7 @@
pthread_key_t key; /* thread private data key */
PRBool keyCreated; /* whether 'key' should be deleted */
PRThread *first, *last; /* list of threads we know about */
-#if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#if defined(_PR_DCETHREADS) || _POSIX_THREAD_PRIORITY_SCHEDULING > 0
PRInt32 minPrio, maxPrio; /* range of scheduling priorities */
#endif
} pt_book = {0};
@@ -63,7 +63,7 @@
static void _pt_thread_death_internal(void *arg, PRBool callDestructors);
static void init_pthread_gc_support(void);
-#if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#if defined(_PR_DCETHREADS) || _POSIX_THREAD_PRIORITY_SCHEDULING > 0
static PRIntn pt_PriorityMap(PRThreadPriority pri)
{
#ifdef NTO
@@ -325,11 +325,11 @@
if (EPERM != pt_schedpriv)
{
-#if !defined(_PR_DCETHREADS) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#if !defined(_PR_DCETHREADS) && _POSIX_THREAD_PRIORITY_SCHEDULING > 0
struct sched_param schedule;
#endif
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#if _POSIX_THREAD_PRIORITY_SCHEDULING > 0
rv = pthread_attr_setinheritsched(&tattr, PTHREAD_EXPLICIT_SCHED);
PR_ASSERT(0 == rv);
#endif
@@ -339,7 +339,7 @@
#if defined(_PR_DCETHREADS)
rv = pthread_attr_setprio(&tattr, pt_PriorityMap(priority));
PR_ASSERT(0 == rv);
-#elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#elif _POSIX_THREAD_PRIORITY_SCHEDULING > 0
rv = pthread_attr_getschedparam(&tattr, &schedule);
PR_ASSERT(0 == rv);
schedule.sched_priority = pt_PriorityMap(priority);
@@ -396,7 +396,7 @@
scope = PR_GLOBAL_THREAD;
if (PR_GLOBAL_BOUND_THREAD == scope) {
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#if _POSIX_THREAD_PRIORITY_SCHEDULING > 0
rv = pthread_attr_setscope(&tattr, PTHREAD_SCOPE_SYSTEM);
if (rv) {
/*
@@ -471,7 +471,7 @@
PR_LOG(_pr_thread_lm, PR_LOG_MIN,
("_PR_CreateThread: no thread scheduling privilege"));
/* Try creating the thread again without setting priority. */
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#if _POSIX_THREAD_PRIORITY_SCHEDULING > 0
rv = pthread_attr_setinheritsched(&tattr, PTHREAD_INHERIT_SCHED);
PR_ASSERT(0 == rv);
#endif
@@ -692,7 +692,7 @@
#if defined(_PR_DCETHREADS)
rv = pthread_setprio(thred->id, pt_PriorityMap(newPri));
/* pthread_setprio returns the old priority */
-#elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#elif _POSIX_THREAD_PRIORITY_SCHEDULING > 0
if (EPERM != pt_schedpriv)
{
int policy;
@@ -921,7 +921,7 @@
pthread_init();
#endif
-#if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
+#if defined(_PR_DCETHREADS) || _POSIX_THREAD_PRIORITY_SCHEDULING > 0
#if defined(FREEBSD)
{
pthread_attr_t attr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/threads/combined/prucpu.c new/nspr-4.10.8/nspr/pr/src/threads/combined/prucpu.c
--- old/nspr-4.10.7/nspr/pr/src/threads/combined/prucpu.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/threads/combined/prucpu.c 2015-01-22 21:44:59.000000000 +0100
@@ -124,7 +124,7 @@
_MD_NEW_LOCK( &cpuQueue->sleepQLock );
_MD_NEW_LOCK( &cpuQueue->miscQLock );
- for (index = 0; index < PR_PRIORITY_LAST + 1; index++)
+ for (index = 0; index < PR_ARRAY_SIZE(cpuQueue->runQ); index++)
PR_INIT_CLIST( &(cpuQueue->runQ[index]) );
PR_INIT_CLIST( &(cpuQueue->sleepQ) );
PR_INIT_CLIST( &(cpuQueue->pauseQ) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/threads/combined/pruthr.c new/nspr-4.10.8/nspr/pr/src/threads/combined/pruthr.c
--- old/nspr-4.10.7/nspr/pr/src/threads/combined/pruthr.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/threads/combined/pruthr.c 2015-01-22 21:44:59.000000000 +0100
@@ -73,13 +73,13 @@
#ifndef HAVE_CUSTOM_USER_THREADS
stack = PR_NEWZAP(PRThreadStack);
#ifdef HAVE_STACK_GROWING_UP
- stack->stackTop = (char*) ((((long)&type) >> _pr_pageShift)
+ stack->stackTop = (char*) ((((PRWord)&type) >> _pr_pageShift)
<< _pr_pageShift);
#else
#if defined(SOLARIS) || defined (UNIXWARE) && defined (USR_SVR4_THREADS)
stack->stackTop = (char*) &thread;
#else
- stack->stackTop = (char*) ((((long)&type + _pr_pageSize - 1)
+ stack->stackTop = (char*) ((((PRWord)&type + _pr_pageSize - 1)
>> _pr_pageShift) << _pr_pageShift);
#endif
#endif
@@ -174,12 +174,12 @@
** Setup stackTop and stackBottom values.
*/
#ifdef HAVE_STACK_GROWING_UP
- ts->allocBase = (char*) ((((long)&ts) >> _pr_pageShift)
+ ts->allocBase = (char*) ((((PRWord)&ts) >> _pr_pageShift)
<< _pr_pageShift);
ts->stackBottom = ts->allocBase + ts->stackSize;
ts->stackTop = ts->allocBase;
#else
- ts->allocBase = (char*) ((((long)&ts + _pr_pageSize - 1)
+ ts->allocBase = (char*) ((((PRWord)&ts + _pr_pageSize - 1)
>> _pr_pageShift) << _pr_pageShift);
ts->stackTop = ts->allocBase;
ts->stackBottom = ts->allocBase - ts->stackSize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/src/threads/prdump.c new/nspr-4.10.8/nspr/pr/src/threads/prdump.c
--- old/nspr-4.10.7/nspr/pr/src/threads/prdump.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/src/threads/prdump.c 2015-01-22 21:44:59.000000000 +0100
@@ -87,7 +87,7 @@
_PR_DumpThread(fd, t);
_PR_DumpPrintf(fd, "Runnable Threads:\n");
- for (i = 0; i < 32; i++) {
+ for (i = 0; i < PR_ARRAY_SIZE(_PR_RUNQ(t->cpu)); i++) {
DumpThreadQueue(fd, &_PR_RUNQ(t->cpu)[i]);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/io_timeout.c new/nspr-4.10.8/nspr/pr/tests/io_timeout.c
--- old/nspr-4.10.7/nspr/pr/tests/io_timeout.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/io_timeout.c 2015-01-22 21:44:59.000000000 +0100
@@ -72,7 +72,7 @@
scope_str = GLOBAL_BOUND_SCOPE_STRING;
break;
default:
- PR_ASSERT(!"Invalid thread scope");
+ PR_NOT_REACHED("Invalid thread scope");
break;
}
printf("thread id %d, scope %s\n", info->id, scope_str);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/multiwait.c new/nspr-4.10.8/nspr/pr/tests/multiwait.c
--- old/nspr-4.10.7/nspr/pr/tests/multiwait.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/multiwait.c 2015-01-22 21:44:59.000000000 +0100
@@ -506,7 +506,7 @@
{
if (PR_PENDING_INTERRUPT_ERROR == PR_GetError()) break;
PL_PrintError("Accept failed");
- MW_ASSERT(!"Accept failed");
+ MW_ASSERT(PR_FALSE && "Accept failed");
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/nblayer.c new/nspr-4.10.8/nspr/pr/tests/nblayer.c
--- old/nspr-4.10.7/nspr/pr/tests/nblayer.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/nblayer.c 2015-01-22 21:44:59.000000000 +0100
@@ -104,7 +104,7 @@
ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
if ((1 != ready) /* if not 1, then we're dead */
|| (0 == (polldesc.in_flags & polldesc.out_flags)))
- { PR_ASSERT(!"Whoa!"); break; }
+ { PR_NOT_REACHED("Whoa!"); break; }
if (verbosity > quiet)
PR_fprintf(
logFile, "Client connect 'in progress' [0x%x]\n",
@@ -143,7 +143,7 @@
ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
if ((1 != ready) /* if not 1, then we're dead */
|| (0 == (polldesc.in_flags & polldesc.out_flags)))
- { PR_ASSERT(!"Whoa!"); break; }
+ { PR_NOT_REACHED("Whoa!"); break; }
}
else break;
} while (bytes_sent < sizeof(buffer));
@@ -171,7 +171,7 @@
ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
if ((1 != ready) /* if not 1, then we're dead */
|| (0 == (polldesc.in_flags & polldesc.out_flags)))
- { PR_ASSERT(!"Whoa!"); break; }
+ { PR_NOT_REACHED("Whoa!"); break; }
}
else break;
} while (bytes_read < bytes_sent);
@@ -213,7 +213,7 @@
ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
if ((1 != ready) /* if not 1, then we're dead */
|| (0 == (polldesc.in_flags & polldesc.out_flags)))
- { PR_ASSERT(!"Whoa!"); break; }
+ { PR_NOT_REACHED("Whoa!"); break; }
}
} while (NULL == service);
PR_ASSERT(NULL != service);
@@ -244,7 +244,7 @@
ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
if ((1 != ready) /* if not 1, then we're dead */
|| (0 == (polldesc.in_flags & polldesc.out_flags)))
- { PR_ASSERT(!"Whoa!"); break; }
+ { PR_NOT_REACHED("Whoa!"); break; }
}
else break;
} while (bytes_read < sizeof(buffer));
@@ -273,7 +273,7 @@
ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
if ((1 != ready) /* if not 1, then we're dead */
|| (0 == (polldesc.in_flags & polldesc.out_flags)))
- { PR_ASSERT(!"Whoa!"); break; }
+ { PR_NOT_REACHED("Whoa!"); break; }
}
else break;
} while (bytes_sent < bytes_read);
@@ -329,7 +329,7 @@
default: break;
}
}
- else PR_ASSERT(!"How'd I get here?");
+ else PR_NOT_REACHED("How'd I get here?");
new_flags = (fd->lower->methods->poll)(fd->lower, my_flags, out_flags);
if (verbosity > chatty)
PR_fprintf(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/priotest.c new/nspr-4.10.8/nspr/pr/tests/priotest.c
--- old/nspr-4.10.7/nspr/pr/tests/priotest.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/priotest.c 2015-01-22 21:44:59.000000000 +0100
@@ -186,7 +186,7 @@
PR_ProcessExit((failed) ? 1 : 0);
- PR_ASSERT(!"You can't get here -- but you did!");
+ PR_NOT_REACHED("You can't get here -- but you did!");
return 1; /* or here */
} /* main */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/rwlockrank.c new/nspr-4.10.8/nspr/pr/tests/rwlockrank.c
--- old/nspr-4.10.7/nspr/pr/tests/rwlockrank.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/rwlockrank.c 2015-01-22 21:44:59.000000000 +0100
@@ -22,7 +22,7 @@
PR_RWLock_Rlock(rwlock1);
PR_RWLock_Unlock(rwlock1);
- // Test correct lock rank.
+ /* Test correct lock rank. */
PR_RWLock_Rlock(rwlock1);
PR_RWLock_Rlock(rwlock2);
PR_RWLock_Unlock(rwlock2);
@@ -41,7 +41,7 @@
PR_RWLock_Unlock(rwlock1);
#if 0
- // Test incorrect lock rank.
+ /* Test incorrect lock rank. */
PR_RWLock_Rlock(rwlock2);
PR_RWLock_Rlock(rwlock1);
PR_RWLock_Unlock(rwlock1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/socket.c new/nspr-4.10.8/nspr/pr/tests/socket.c
--- old/nspr-4.10.7/nspr/pr/tests/socket.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/socket.c 2015-01-22 21:44:59.000000000 +0100
@@ -328,7 +328,7 @@
native_thread = 1;
break;
default:
- PR_ASSERT(!"Invalid scope");
+ PR_NOT_REACHED("Invalid scope");
break;
}
if (native_thread) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/testfile.c new/nspr-4.10.8/nspr/pr/tests/testfile.c
--- old/nspr-4.10.7/nspr/pr/tests/testfile.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/testfile.c 2015-01-22 21:44:59.000000000 +0100
@@ -120,7 +120,7 @@
native_thread = 1;
break;
default:
- PR_ASSERT(!"Invalid scope");
+ PR_NOT_REACHED("Invalid scope");
break;
}
if (native_thread) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.10.7/nspr/pr/tests/vercheck.c new/nspr-4.10.8/nspr/pr/tests/vercheck.c
--- old/nspr-4.10.7/nspr/pr/tests/vercheck.c 2014-08-12 17:40:57.000000000 +0200
+++ new/nspr-4.10.8/nspr/pr/tests/vercheck.c 2015-01-22 21:44:59.000000000 +0100
@@ -23,7 +23,7 @@
* This release (4.10.7) is backward compatible with the
* 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x,
* 4.8.x, 4.9.x, 4.10, 4.10.1, 4.10.2, 4.10.3, 4.10.4,
- * 4.10.5, and 4.10.6 releases.
+ * 4.10.5, 4.10.6 and 4.10.7 releases.
* It, of course, is compatible with itself.
*/
static char *compatible_version[] = {
@@ -39,7 +39,7 @@
"4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", "4.9.5",
"4.9.6",
"4.10", "4.10.1", "4.10.2", "4.10.3", "4.10.4",
- "4.10.5", "4.10.6",
+ "4.10.5", "4.10.6", "4.10.7",
PR_VERSION
};
@@ -55,7 +55,7 @@
"3.0", "3.0.1",
"3.1", "3.1.1", "3.1.2", "3.1.3",
"3.5", "3.5.1",
- "4.10.8",
+ "4.10.9",
"4.11", "4.11.1",
"10.0", "11.1", "12.14.20"
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
