Date: Tue, 14 Aug 2012 22:42:47 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r932 - branches/experimental/devel/nspr/files Message-ID: <201208142242.q7EMgl8f073785@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Aug 14 22:42:47 2012
New Revision: 932
Log:
move untracked warnings patches to one place
Added:
branches/experimental/devel/nspr/files/patch-bug782815
Deleted:
branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c
Modified:
branches/experimental/devel/nspr/files/patch-warnings
Deleted: branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c
==============================================================================
--- branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c Tue Aug 14 22:42:47 2012 (r931)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
---- ../pr/src/pthreads/ptio.c 2009-05-09 23:07:02.000000000 -0400
-+++ ../pr/src/pthreads/ptio.c 2009-11-04 15:24:47.000000000 -0500
-@@ -1168,7 +1168,7 @@
- osfd = socket(AF_INET6, SOCK_STREAM, 0);
- if (osfd != -1) {
- int on;
-- int optlen = sizeof(on);
-+ socklen_t optlen = sizeof(on);
- if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
- &on, &optlen) == 0) {
- _pr_ipv6_v6only_on_by_default = on;
-@@ -3758,7 +3769,7 @@
- * We use these variables to figure out how much time has
- * elapsed and how much of the timeout still remains.
- */
-- PRIntervalTime start, elapsed, remaining;
-+ PRIntervalTime start = 0, elapsed, remaining;
-
- if (pt_TestAbort()) return -1;
-
-@@ -4927,6 +4938,7 @@
-
- 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(
Added: branches/experimental/devel/nspr/files/patch-bug782815
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/devel/nspr/files/patch-bug782815 Tue Aug 14 22:42:47 2012 (r932)
@@ -0,0 +1,11 @@
+--- ../pr/src/pthreads/ptio.c~
++++ ../pr/src/pthreads/ptio.c
+@@ -1150,7 +1150,7 @@ void _PR_InitIO(void)
+ osfd = socket(AF_INET6, SOCK_STREAM, 0);
+ if (osfd != -1) {
+ int on;
+- int optlen = sizeof(on);
++ socklen_t optlen = sizeof(on);
+ if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &on, &optlen) == 0) {
+ _pr_ipv6_v6only_on_by_default = on;
Modified: branches/experimental/devel/nspr/files/patch-warnings
==============================================================================
--- branches/experimental/devel/nspr/files/patch-warnings Tue Aug 14 21:44:31 2012 (r931)
+++ branches/experimental/devel/nspr/files/patch-warnings Tue Aug 14 22:42:47 2012 (r932)
@@ -1,3 +1,22 @@
+--- ../pr/src/pthreads/ptio.c 2009-05-09 23:07:02.000000000 -0400
++++ ../pr/src/pthreads/ptio.c 2009-11-04 15:24:47.000000000 -0500
+@@ -3758,7 +3769,7 @@
+ * We use these variables to figure out how much time has
+ * elapsed and how much of the timeout still remains.
+ */
+- PRIntervalTime start, elapsed, remaining;
++ PRIntervalTime start = 0, elapsed, remaining;
+
+ if (pt_TestAbort()) return -1;
+
+@@ -4927,6 +4938,7 @@
+
+ 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(
--- ../pr/src/pthreads/ptsynch.c Mon Nov 22 16:24:53 2004
+++ ../pr/src/pthreads/ptsynch.c Mon Jul 25 00:03:49 2005
@@ -63,5 +63,5 @@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208142242.q7EMgl8f073785>