From: Torvald Riegel <triegel@redhat.com>
Date: Fri, 15 Jan 2016 21:40:50 +0000 (+0100)
Subject: Fix pthread_barrier_init typo.
X-Git-Tag: glibc-2.23~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12c3bb770dd3ea11215baf23b385dbf297a2a85c;p=thirdparty%2Fglibc.git

Fix pthread_barrier_init typo.

Applies Paul Eggert's fix for BZ 18868.
---

diff --git a/ChangeLog b/ChangeLog
index 5d806648ef2..13d8175bea4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-15  Torvald Riegel  <triegel@redhat.com>
+
+	[BZ #18868]
+	* nptl/pthread_barrier_init.c (__pthread_barrier_init): Apply fix.
+
 2016-01-16  Andrew Senkevich  <andrew.senkevich@intel.com>
 
 	* sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Added new files.
diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c
index 8f89df12ca3..822e17e4954 100644
--- a/nptl/pthread_barrier_init.c
+++ b/nptl/pthread_barrier_init.c
@@ -42,7 +42,7 @@ __pthread_barrier_init (pthread_barrier_t *barrier,
 
   const struct pthread_barrierattr *iattr
     = (attr != NULL
-       ? iattr = (struct pthread_barrierattr *) attr
+       ? (struct pthread_barrierattr *) attr
        : &default_barrierattr);
 
   ibarrier = (struct pthread_barrier *) barrier;