From: Jarkko Hietaniemi Date: Mon, 28 Jul 2003 14:16:44 +0000 (+0000) Subject: Retract #20260. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=94a175e1e66fdf300e5894aacd2a4d1ae811f692;p=p5sagit%2Fp5-mst-13.2.git Retract #20260. p4raw-id: //depot/perl@20267 --- diff --git a/perlio.c b/perlio.c index 24293c0..b0649df 100644 --- a/perlio.c +++ b/perlio.c @@ -2485,7 +2485,7 @@ PerlIOUnix_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count) } } -Off_t +IV PerlIOUnix_seek(pTHX_ PerlIO *f, Off_t offset, int whence) { int fd = PerlIOSelf(f, PerlIOUnix)->fd; @@ -3061,18 +3061,18 @@ PerlIOStdio_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count) return got; } -Off_t +IV PerlIOStdio_seek(pTHX_ PerlIO *f, Off_t offset, int whence) { FILE *stdio = PerlIOSelf(f, PerlIOStdio)->stdio; - return fseek(stdio, offset, whence); + return PerlSIO_fseek(stdio, offset, whence); } Off_t PerlIOStdio_tell(pTHX_ PerlIO *f) { FILE *stdio = PerlIOSelf(f, PerlIOStdio)->stdio; - return ftell(stdio); + return PerlSIO_ftell(stdio); } IV @@ -3713,7 +3713,7 @@ PerlIOBuf_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count) return written; } -Off_t +IV PerlIOBuf_seek(pTHX_ PerlIO *f, Off_t offset, int whence) { IV code; @@ -3912,7 +3912,7 @@ PerlIOPending_close(pTHX_ PerlIO *f) return PerlIO_close(f); } -Off_t +IV PerlIOPending_seek(pTHX_ PerlIO *f, Off_t offset, int whence) { /* diff --git a/perliol.h b/perliol.h index a0d4429..47fe6fc 100644 --- a/perliol.h +++ b/perliol.h @@ -33,7 +33,7 @@ struct _PerlIO_funcs { SSize_t(*Read) (pTHX_ PerlIO *f, void *vbuf, Size_t count); SSize_t(*Unread) (pTHX_ PerlIO *f, const void *vbuf, Size_t count); SSize_t(*Write) (pTHX_ PerlIO *f, const void *vbuf, Size_t count); - Off_t (*Seek) (pTHX_ PerlIO *f, Off_t offset, int whence); + IV (*Seek) (pTHX_ PerlIO *f, Off_t offset, int whence); Off_t(*Tell) (pTHX_ PerlIO *f); IV (*Close) (pTHX_ PerlIO *f); /* Stdio-like buffered IO functions */ @@ -176,7 +176,7 @@ extern PerlIO *PerlIOBuf_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, in extern SSize_t PerlIOBuf_read(pTHX_ PerlIO *f, void *vbuf, Size_t count); extern SSize_t PerlIOBuf_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count); extern SSize_t PerlIOBuf_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count); -extern Off_t PerlIOBuf_seek(pTHX_ PerlIO *f, Off_t offset, int whence); +extern IV PerlIOBuf_seek(pTHX_ PerlIO *f, Off_t offset, int whence); extern Off_t PerlIOBuf_tell(pTHX_ PerlIO *f); extern IV PerlIOBuf_close(pTHX_ PerlIO *f); extern IV PerlIOBuf_flush(pTHX_ PerlIO *f);