stas 2002/06/21 08:53:40
Modified: xs/APR/PerlIO apr_perlio.c
Log:
a few minor fixes and cleanups
Revision Changes Path
1.17 +3 -7 modperl-2.0/xs/APR/PerlIO/apr_perlio.c
Index: apr_perlio.c
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/apr_perlio.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_perlio.c 21 Jun 2002 15:28:43 -0000 1.16
+++ apr_perlio.c 21 Jun 2002 15:53:40 -0000 1.17
@@ -28,7 +28,6 @@
apr_pool_t *pool;
} PerlIOAPR;
-
static IV PerlIOAPR_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg)
{
IV code = PerlIOBase_pushed(aTHX_ f, mode, arg);
@@ -40,7 +39,6 @@
return code;
}
-
static PerlIO *PerlIOAPR_open(pTHX_ PerlIO_funcs *self,
PerlIO_list_t *layers, IV n,
const char *mode, int fd, int imode,
@@ -147,7 +145,6 @@
return NULL;
}
-
static SSize_t PerlIOAPR_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
{
PerlIOAPR *st = PerlIOSelf(f, PerlIOAPR);
@@ -159,8 +156,8 @@
return count;
}
else if (rc != APR_SUCCESS) {
- char errbuf[120];
#ifdef PERLIO_APR_DEBUG
+ char errbuf[120];
/* XXX: need to figure way to map APR errno to normal errno,
* so we can use SETERRNO to make the apr errors available to
* Perl's $! */
@@ -203,6 +200,7 @@
return 0;
}
+ PerlIOBase(f)->flags |= PERLIO_F_ERROR;
return -1;
}
@@ -225,7 +223,7 @@
/* Flush the fill buffer */
if (PerlIO_flush(f) != 0) {
- return -1;
+ return -1;
}
switch(whence) {
@@ -366,8 +364,6 @@
return -1;
}
-
-
static PerlIO_funcs PerlIO_APR = {
"APR",
