dougm 01/12/17 17:13:15
Modified: xs/APR/PerlIO apr_perlio.c
Log:
style nits:
- no //comments
- no else branch where if returns a value
- whitespace--
make note that modperl_* functions cannot be used outside of httpd
Revision Changes Path
1.4 +33 -36 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_perlio.c 2001/12/18 00:37:01 1.3
+++ apr_perlio.c 2001/12/18 01:13:15 1.4
@@ -31,7 +31,7 @@
*/
static IV PerlIOAPR_popped(PerlIO *f)
{
- //PerlIOAPR *st = PerlIOSelf(f, PerlIOAPR);
+ /* PerlIOAPR *st = PerlIOSelf(f, PerlIOAPR); */
return 0;
}
@@ -48,7 +48,7 @@
apr_status_t rc;
SV *sv;
- if ( !(SvROK(arg) || SvPOK(arg)) ) {
+ if (!(SvROK(arg) || SvPOK(arg))) {
return NULL;
}
@@ -78,6 +78,7 @@
st = PerlIOSelf(f, PerlIOAPR);
sv = args[narg-1];
+ /* XXX: modperl_sv2pool cannot be used outside of httpd */
st->pool = modperl_sv2pool(aTHX_ sv);
rc = apr_file_open(&st->file, path, apr_flag, APR_OS_DEFAULT, st->pool);
@@ -85,10 +86,9 @@
PerlIOBase(f)->flags |= PERLIO_F_ERROR;
return NULL;
}
- else {
- PerlIOBase(f)->flags |= PERLIO_F_OPEN;
- return f;
- }
+
+ PerlIOBase(f)->flags |= PERLIO_F_OPEN;
+ return f;
}
static IV PerlIOAPR_fileno(PerlIO *f)
@@ -105,7 +105,7 @@
{
apr_status_t rc;
- if ( (f = PerlIOBase_dup(aTHX_ f, o, param, flags)) ) {
+ if ((f = PerlIOBase_dup(aTHX_ f, o, param, flags))) {
PerlIOAPR *fst = PerlIOSelf(f, PerlIOAPR);
PerlIOAPR *ost = PerlIOSelf(o, PerlIOAPR);
@@ -117,10 +117,8 @@
}
return NULL;
-
}
-
/* currrently read is very not-optimized, since in many cases the read
* process happens a char by char. Need to find a way to snoop on APR
* read buffer from PerlIO, or implement our own buffering layer here
@@ -129,33 +127,33 @@
{
PerlIOAPR *st = PerlIOSelf(f, PerlIOAPR);
apr_status_t rc;
- dTHX;
+ dTHX; /* XXX: change Perl so this function has a pTHX_ prototype */
-// fprintf(stderr, "in read: count %d, %s\n", (int)count, (char*) vbuf);
+ /* fprintf(stderr, "in read: count %d, %s\n",
+ (int)count, (char*) vbuf); */
rc = apr_file_read(st->file, vbuf, &count);
-// fprintf(stderr, "out read: count %d, %s\n", (int)count, (char*) vbuf);
+ /* fprintf(stderr, "out read: count %d, %s\n",
+ (int)count, (char*) vbuf); */
if (rc == APR_SUCCESS) {
return (SSize_t) count;
}
- else {
- return (SSize_t) -1;
- }
-}
+ return (SSize_t) -1;
+}
static SSize_t PerlIOAPR_write(PerlIO *f, const void *vbuf, Size_t count)
{
PerlIOAPR *st = PerlIOSelf(f, PerlIOAPR);
apr_status_t rc;
-// fprintf(stderr, "in write: count %d, %s\n", (int)count, (char*) vbuf);
+ /* fprintf(stderr, "in write: count %d, %s\n",
+ (int)count, (char*) vbuf); */
rc = apr_file_write(st->file, vbuf, &count);
if (rc == APR_SUCCESS) {
return (SSize_t) count;
}
- else {
- return (SSize_t) -1;
- }
+
+ return (SSize_t) -1;
}
static IV PerlIOAPR_seek(PerlIO *f, Off_t offset, int whence)
@@ -186,9 +184,8 @@
if (rc == APR_SUCCESS) {
return 0;
}
- else {
- return -1;
- }
+
+ return -1;
}
static Off_t PerlIOAPR_tell(PerlIO *f)
@@ -202,10 +199,9 @@
rc = apr_file_seek(st->file, APR_CUR, &offset);
if (rc == APR_SUCCESS) {
return (Off_t) offset;
- }
- else {
- return (Off_t) -1;
}
+
+ return (Off_t) -1;
}
static IV PerlIOAPR_close(PerlIO *f)
@@ -216,7 +212,7 @@
const char *new_path;
apr_file_name_get(&new_path, st->file);
-// fprintf(stderr, "closing file %s\n", new_path);
+ /* fprintf(stderr, "closing file %s\n", new_path); */
rc = apr_file_flush(st->file);
if (rc != APR_SUCCESS) {
@@ -240,9 +236,8 @@
if (rc == APR_SUCCESS) {
return 0;
}
- else {
- return -1;
- }
+
+ return -1;
}
static IV PerlIOAPR_fill(PerlIO *f)
@@ -262,8 +257,9 @@
case APR_EOF:
return 1;
default:
- return -1;
}
+
+ return -1;
}
static PerlIO_funcs PerlIO_APR = {
@@ -338,10 +334,9 @@
PerlIOBase(f)->flags |= PERLIO_F_OPEN;
return f;
- }
- else {
- return NULL;
}
+
+ return NULL;
}
/*
@@ -349,6 +344,7 @@
*/
static SV *apr_perlio_PerlIO_to_glob(pTHX_ PerlIO *pio, int type)
{
+ /* XXX: modperl_perl_gensym() cannot be used outside of httpd */
SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
GV *gv = (GV*)SvRV(retval);
@@ -379,7 +375,7 @@
#elif !defined(PERLIO_LAYERS) /* NOT PERLIO_LAYERS (5.6.1) */
-FILE *apr_perlio_apr_file_to_FILE(pTHX_ apr_file_t *file, int type)
+static FILE *apr_perlio_apr_file_to_FILE(pTHX_ apr_file_t *file, int type)
{
FILE *retval;
char *mode;
@@ -405,7 +401,7 @@
}
fd = PerlLIO_dup(os_file);
-// Perl_warn(aTHX_ "fd old: %d, new %d\n", os_file, fd);
+ /* Perl_warn(aTHX_ "fd old: %d, new %d\n", os_file, fd); */
if (!(retval = PerlIO_fdopen(fd, mode))) {
PerlLIO_close(fd);
@@ -422,6 +418,7 @@
SV *apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
apr_pool_t *pool, int type)
{
+ /* XXX: modperl_perl_gensym() cannot be used outside of httpd */
SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
GV *gv = (GV*)SvRV(retval);
