From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82641 invoked by alias); 18 Dec 2017 19:18:22 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 82598 invoked by uid 9078); 18 Dec 2017 19:18:21 -0000 Date: Mon, 18 Dec 2017 19:18:00 -0000 Message-ID: <20171218191821.82595.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: ftello{64}: Fix type of returned value X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 1251555311100fc04550201f838a22c3193821ad X-Git-Newrev: dc2d175721df8ceb801d50581df95b49c26a6ff7 X-SW-Source: 2017-q4/txt/msg00084.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=dc2d175721df8ceb801d50581df95b49c26a6ff7 commit dc2d175721df8ceb801d50581df95b49c26a6ff7 Author: Corinna Vinschen Date: Mon Dec 18 20:15:27 2017 +0100 newlib: ftello{64}: Fix type of returned value Especially don't just use -1L since _off_t/_off64_t are not guaranteed to be of type long. Signed-off-by: Corinna Vinschen Diff: --- newlib/libc/stdio/ftello.c | 8 ++++---- newlib/libc/stdio64/ftello64.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c index c120c26..0a9bb7b 100644 --- a/newlib/libc/stdio/ftello.c +++ b/newlib/libc/stdio/ftello.c @@ -99,7 +99,7 @@ _DEFUN(_ftello_r, (ptr, fp), { ptr->_errno = ESPIPE; _newlib_flockfile_exit (fp); - return -1L; + return (_off_t) -1; } /* Find offset of underlying I/O object, then adjust for buffered @@ -113,10 +113,10 @@ _DEFUN(_ftello_r, (ptr, fp), else { pos = fp->_seek (ptr, fp->_cookie, (_fpos_t) 0, SEEK_CUR); - if (pos == -1L) + if (pos == (_fpos_t) -1) { _newlib_flockfile_exit (fp); - return pos; + return (_off_t) -1; } } if (fp->_flags & __SRD) @@ -141,7 +141,7 @@ _DEFUN(_ftello_r, (ptr, fp), } _newlib_flockfile_end (fp); - return pos; + return (_off_t) pos; } #ifndef _REENT_ONLY diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c index c6226d1..9aca231 100644 --- a/newlib/libc/stdio64/ftello64.c +++ b/newlib/libc/stdio64/ftello64.c @@ -96,7 +96,7 @@ _DEFUN (_ftello64_r, (ptr, fp), { ptr->_errno = ESPIPE; _newlib_flockfile_exit(fp); - return -1L; + return (_off64_t) -1; } /* Find offset of underlying I/O object, then adjust for buffered @@ -110,10 +110,10 @@ _DEFUN (_ftello64_r, (ptr, fp), else { pos = fp->_seek64 (ptr, fp->_cookie, (_fpos64_t) 0, SEEK_CUR); - if (pos == -1L) + if (pos == (_fpos64_t) -1) { _newlib_flockfile_exit(fp); - return pos; + return (_off64_t) pos; } } if (fp->_flags & __SRD) @@ -138,7 +138,7 @@ _DEFUN (_ftello64_r, (ptr, fp), } _newlib_flockfile_end(fp); - return pos; + return (_off64_t) pos; } #ifndef _REENT_ONLY