From owner-svn-src-stable@FreeBSD.ORG Sat Dec 13 16:53:35 2008 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9B221065673; Sat, 13 Dec 2008 16:53:35 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D69208FC16; Sat, 13 Dec 2008 16:53:35 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDGrZRF034553; Sat, 13 Dec 2008 16:53:35 GMT (envelope-from ru@svn.freebsd.org) Received: (from ru@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBDGrZkM034552; Sat, 13 Dec 2008 16:53:35 GMT (envelope-from ru@svn.freebsd.org) Message-Id: <200812131653.mBDGrZkM034552@svn.freebsd.org> From: Ruslan Ermilov Date: Sat, 13 Dec 2008 16:53:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186042 - releng/7.1/lib/libc releng/7.1/lib/libc/stdio stable/7/lib/libc stable/7/lib/libc/stdio X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 16:53:36 -0000 Author: ru Date: Sat Dec 13 16:53:35 2008 New Revision: 186042 URL: http://svn.freebsd.org/changeset/base/186042 Log: MFC: Fix fread() to return a correct value on platforms where sizeof(int) != sizeof(size_t), i.e. on all 64-bit platforms. Approved by: re (kib) Modified: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdio/fread.c Changes in other areas also in this revision: Modified: releng/7.1/lib/libc/ (props changed) releng/7.1/lib/libc/stdio/fread.c Modified: stable/7/lib/libc/stdio/fread.c ============================================================================== --- stable/7/lib/libc/stdio/fread.c Sat Dec 13 16:13:37 2008 (r186041) +++ stable/7/lib/libc/stdio/fread.c Sat Dec 13 16:53:35 2008 (r186042) @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); size_t fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp) { - int ret; + size_t ret; FLOCKFILE(fp); ret = __fread(buf, size, count, fp);