From owner-svn-src-all@FreeBSD.ORG  Tue Jul 22 16:10:56 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C38D9931;
 Tue, 22 Jul 2014 16:10:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B1245275B;
 Tue, 22 Jul 2014 16:10:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MGAuRF065271;
 Tue, 22 Jul 2014 16:10:56 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MGAugj065254;
 Tue, 22 Jul 2014 16:10:56 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201407221610.s6MGAugj065254@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Tue, 22 Jul 2014 16:10:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268983 - head/lib/libc/stdio
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2014 16:10:56 -0000

Author: pfg
Date: Tue Jul 22 16:10:56 2014
New Revision: 268983
URL: http://svnweb.freebsd.org/changeset/base/268983

Log:
  rewind: always clear error indicator.
  
  Required by POSIX:
  http://pubs.opengroup.org/onlinepubs/009695399/functions/rewind.html
  
  Obtained from:	Apple Inc. (Libc 997.90.3)
  MFC after:	1 week

Modified:
  head/lib/libc/stdio/rewind.c

Modified: head/lib/libc/stdio/rewind.c
==============================================================================
--- head/lib/libc/stdio/rewind.c	Tue Jul 22 13:58:33 2014	(r268982)
+++ head/lib/libc/stdio/rewind.c	Tue Jul 22 16:10:56 2014	(r268983)
@@ -53,9 +53,8 @@ rewind(FILE *fp)
 		__sinit();
 
 	FLOCKFILE(fp);
-	if (_fseeko(fp, (off_t)0, SEEK_SET, 1) == 0) {
-		clearerr_unlocked(fp);
+	if (_fseeko(fp, (off_t)0, SEEK_SET, 1) == 0)
 		errno = serrno;
-	}
+	clearerr_unlocked(fp);	/* POSIX: clear stdio error regardless */
 	FUNLOCKFILE(fp);
 }