From c99326aa8dc2797567ec48ca18ab413ec2fd4fe5 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Fri, 6 Jun 2008 00:23:20 +0000
Subject: ''

---
 CONTRIBUTORS                  |  1 +
 ChangeLog                     | 15 +++++++++++++--
 NEWS                          | 10 ++++++++--
 pthread_attr_getdetachstate.c |  1 -
 ptw32_throw.c                 |  7 ++++++-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e5b7325..0d650e1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -114,6 +114,7 @@ Piet van Bruggen	pietvb at newbridges dot nl
 Makoto Kato		raven at oldskool dot jp
 					AMD64 port.
 Panagiotis E. Hadjidoukas	peh at hpclab dot ceid dot upatras dot gr
+                                phadjido at cs dot uoi dot gr
 					Contributed the QueueUserAPCEx package which
 					makes preemptive async cancelation possible.
 Will Bryant		will dot bryant at ecosm dot com
diff --git a/ChangeLog b/ChangeLog
index 6dae638..2017df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
+2008-06-06  Robert Kindred  <RKindred at SwRI dot edu>
+
+        * ptw32_throw.c (ptw32_throw): Remove possible reference to NULL
+        pointer. (At the same time made the switch block conditionally
+        included only if exitCode is needed - RPJ.)
+
+2008-02-21  Sebastian Gottschalk  <seppig_relay at gmx dot de>
+
+        * pthread_attr_getdetachstate.c (pthread_attr_getdetachstate):
+        Remove potential and superfluous null pointer assignment.
+
 2007-11-22  Ivan Pizhenko  <ivanp4 at ua dot fm>
 
-        * pthread.h (gmtime_r) gmtime returns 0 if tm represents a time
+        * pthread.h (gmtime_r): gmtime returns 0 if tm represents a time
         prior to 1/1/1970. Notice this to prevent raising an exception.
-        * pthread.h (localtime_r) Likewise for localtime.
+        * pthread.h (localtime_r): Likewise for localtime.
 
 2007-07-14  Marcel Ruff  <mr at marcelruff dot info>
 
diff --git a/NEWS b/NEWS
index dc78d67..6bb2f48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,14 @@
 RELEASE 2.9.0
 -------------
-(2007-??-??)
+(2008-??-??)
 
 General
 -------
 New bug fixes in this release since 2.8.0 have NOT been applied to the
 1.x.x series.
 
+Version 1 no longer maintained
+------------------------------
 The 1.x.x series is no longer maintained. However, if you really need a
 version 1, the differences between 1.11.0 and 2.7.0 are very small, mainly
 revolving around the pthread_once_t_ struct. Those differences applied
@@ -35,7 +37,11 @@ Remove potential deadlock condition from pthread_cond_destroy().
 
 Various modifications to build and test for Win64.
 - Kip Streithorst
-        
+
+Various fixes to the QueueUserAPCEx async cancellation helper DLL
+and pthreads code cleanups.
+- Sebastian Gottschalk
+
 
 RELEASE 2.8.0
 -------------
diff --git a/pthread_attr_getdetachstate.c b/pthread_attr_getdetachstate.c
index 978f288..188533b 100644
--- a/pthread_attr_getdetachstate.c
+++ b/pthread_attr_getdetachstate.c
@@ -78,7 +78,6 @@ pthread_attr_getdetachstate (const pthread_attr_t * attr, int *detachstate)
 {
   if (ptw32_is_attr (attr) != 0 || detachstate == NULL)
     {
-      *detachstate = PTHREAD_CREATE_DETACHED;
       return EINVAL;
     }
 
diff --git a/ptw32_throw.c b/ptw32_throw.c
index 493f4e4..b276119 100644
--- a/ptw32_throw.c
+++ b/ptw32_throw.c
@@ -73,6 +73,7 @@ ptw32_throw (DWORD exception)
        * explicit thread exit here after cleaning up POSIX
        * residue (i.e. cleanup handlers, POSIX thread handle etc).
        */
+#if ! defined (__MINGW32__) || defined (__MSVCRT__) || defined (__DMC__)
       unsigned exitCode = 0;
 
       switch (exception)
@@ -81,9 +82,13 @@ ptw32_throw (DWORD exception)
 	  exitCode = (unsigned) PTHREAD_CANCELED;
 	  break;
 	case PTW32_EPS_EXIT:
-	  exitCode = (unsigned) sp->exitStatus;;
+	  if (NULL != sp)
+	    {
+	      exitCode = (unsigned) sp->exitStatus;
+	    }
 	  break;
 	}
+#endif
 
 #if defined(PTW32_STATIC_LIB)
 
-- 
cgit v1.2.3