From patchwork Fri Jan 15 22:05:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Torvald Riegel X-Patchwork-Id: 568494 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 22BAC140BA4 for ; Sat, 16 Jan 2016 09:06:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=JJ5yQ2Hi; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:subject:from:to:date:content-type :mime-version:content-transfer-encoding; q=dns; s=default; b=Bur MZQgax2lRav8Jg3ihoY/8ftXxPdfe1T39lQl9gFnM/SrX1gT3AZ4g108dzopw9zk HdcmSMiCUDKFZzzNOa4EwpNlEcbpqYXeg46cbShpkN9YtW3tkFjgepeMb3XW8qQY nAfSqED9f+FlCHpgMDO12FsY5l4+jVV0c/0a9Ug4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:subject:from:to:date:content-type :mime-version:content-transfer-encoding; s=default; bh=XuA2ZDhFU i+Hsg9xmHw8FCWK7rY=; b=JJ5yQ2HiyLKbbHPWtPhyQRgkRLkmyI+2uefhVL9Uj Zh4O6ZY99toKJYqXMkbbtpz5QSPhBwoDEsk809PKd7fdP3unLyoaVzdN2kOvxREc LYi5eVHqYTwBJodgiGIuzIsUgAjt0M5JhlINsshYB++2ImtOluPRu+4Qf5//CnV/ BQ= Received: (qmail 113080 invoked by alias); 15 Jan 2016 22:06:05 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 113063 invoked by uid 89); 15 Jan 2016 22:06:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=42, 7, H*MI:localhost X-HELO: mx1.redhat.com Message-ID: <1452895559.26597.378.camel@localhost.localdomain> Subject: [committed] Fix pthread_barrier_init typo. From: Torvald Riegel To: GLIBC Devel Date: Fri, 15 Jan 2016 23:05:59 +0100 Mime-Version: 1.0 Applies Paul Eggert's fix for BZ 18868. diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c index 8f89df1..822e17e 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;