From: Sascha Wildner <saw@online.de>
Date: Mon, 5 Dec 2011 21:46:06 +0000 (+0100)
Subject: pthread_condattr_setclock(3): Fix the check for a known clock.
X-Git-Tag: v3.0.0~476
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/6bbb5e4a0e434d4f17f3e26e90693dc4792622dd

pthread_condattr_setclock(3): Fix the check for a known clock.

The way it was before, this function would always return EINVAL.
---

diff --git a/lib/libthread_xu/thread/thr_condattr.c b/lib/libthread_xu/thread/thr_condattr.c
index 9705243bcc..30f41b1983 100644
--- a/lib/libthread_xu/thread/thr_condattr.c
+++ b/lib/libthread_xu/thread/thr_condattr.c
@@ -28,8 +28,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $DragonFly: src/lib/libthread_xu/thread/thr_condattr.c,v 1.6 2006/04/06 13:03:09 davidxu Exp $
  */
 
 #include "namespace.h"
@@ -96,7 +94,7 @@ _pthread_condattr_setclock(pthread_condattr_t *attr,
 {
 	if (attr == NULL || *attr == NULL)
 		return (EINVAL);
-	if (clock_id != CLOCK_REALTIME ||
+	if (clock_id != CLOCK_REALTIME &&
 	    clock_id != CLOCK_MONOTONIC)
 		return (EINVAL);
 	(*attr)->c_clockid = clock_id;