summaryrefslogtreecommitdiff
path: root/perlio.c
diff options
context:
space:
mode:
authorSteve Peters <steve@fisharerojo.org>2008-11-08 15:51:45 +0000
committerSteve Peters <steve@fisharerojo.org>2008-11-08 15:51:45 +0000
commit2376d97dd5675c65de55efc384814387b6c9a63f (patch)
treee5de01ba38bd3591a3ec4d7828ec159565ff644b /perlio.c
parent622e1e49fb8292c5e8f08cf673d2c3e4ef81406b (diff)
downloadperl-2376d97dd5675c65de55efc384814387b6c9a63f.tar.gz
From change #34775, reverting perlio.c change for now. Also,
setting the tests to TODO. p4raw-link: @34775 on //depot/perl: 2556f95e0f4f5e8e95c9766374614ab52edefe3d p4raw-id: //depot/perl@34778
Diffstat (limited to 'perlio.c')
-rw-r--r--perlio.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/perlio.c b/perlio.c
index 436bb85a68..a3ea344620 100644
--- a/perlio.c
+++ b/perlio.c
@@ -2736,14 +2736,9 @@ PerlIOUnix_tell(pTHX_ PerlIO *f)
return PerlLIO_lseek(PerlIOSelf(f, PerlIOUnix)->fd, 0, SEEK_CUR);
}
-IV
-PerlIOUnix_close(pTHX_ PerlIO *f)
-{
- return PerlIOBase_noop_ok(aTHX_ f);
-}
IV
-PerlIOUnix_popped(pTHX_ PerlIO *f)
+PerlIOUnix_close(pTHX_ PerlIO *f)
{
dVAR;
const int fd = PerlIOSelf(f, PerlIOUnix)->fd;
@@ -2777,7 +2772,7 @@ PERLIO_FUNCS_DECL(PerlIO_unix) = {
sizeof(PerlIOUnix),
PERLIO_K_RAW,
PerlIOUnix_pushed,
- PerlIOUnix_popped,
+ PerlIOBase_popped,
PerlIOUnix_open,
PerlIOBase_binmode, /* binmode */
NULL,
@@ -3127,12 +3122,6 @@ PerlIOStdio_invalidate_fileno(pTHX_ FILE *f)
IV
PerlIOStdio_close(pTHX_ PerlIO *f)
{
- return PerlIOBase_noop_ok(aTHX_ f);
-}
-
-IV
-PerlIOStdio_popped(pTHX_ PerlIO *f)
-{
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
if (!stdio) {
errno = EBADF;
@@ -3569,7 +3558,7 @@ PERLIO_FUNCS_DECL(PerlIO_stdio) = {
sizeof(PerlIOStdio),
PERLIO_K_BUFFERED|PERLIO_K_RAW,
PerlIOStdio_pushed,
- PerlIOStdio_popped,
+ PerlIOBase_popped,
PerlIOStdio_open,
PerlIOBase_binmode, /* binmode */
NULL,