randyk 2004/07/09 11:28:00
Modified: xs/APR/PerlIO PerlIO.xs modperl_apr_perlio.c
modperl_apr_perlio.h
xs/Apache/SubProcess Apache__SubProcess.h
xs/tables/current/Apache StructureTable.pm
Log:
Reviewed by: stas
As apr_perlio.[ch] are now public, do a s/apr_perlio/modperl_apr_perlio/
in xs/APR/PerlIO/, and adjust related files accordingly.
Revision Changes Path
1.4 +1 -1 modperl-2.0/xs/APR/PerlIO/PerlIO.xs
Index: PerlIO.xs
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/PerlIO.xs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PerlIO.xs 27 Jun 2004 23:41:07 -0000 1.3
+++ PerlIO.xs 9 Jul 2004 18:27:59 -0000 1.4
@@ -21,4 +21,4 @@
PROTOTYPES: disabled
BOOT:
- apr_perlio_init(aTHX);
+ modperl_apr_perlio_init(aTHX);
1.3 +32 -28 modperl-2.0/xs/APR/PerlIO/modperl_apr_perlio.c
Index: modperl_apr_perlio.c
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/modperl_apr_perlio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modperl_apr_perlio.c 2 Jul 2004 00:01:23 -0000 1.2
+++ modperl_apr_perlio.c 9 Jul 2004 18:27:59 -0000 1.3
@@ -423,10 +423,10 @@
NULL, /* set_ptrcnt */
};
-void apr_perlio_init(pTHX)
+void modperl_apr_perlio_init(pTHX)
{
- APR_REGISTER_OPTIONAL_FN(apr_perlio_apr_file_to_PerlIO);
- APR_REGISTER_OPTIONAL_FN(apr_perlio_apr_file_to_glob);
+ APR_REGISTER_OPTIONAL_FN(modperl_apr_perlio_apr_file_to_PerlIO);
+ APR_REGISTER_OPTIONAL_FN(modperl_apr_perlio_apr_file_to_glob);
PerlIO_define_layer(aTHX_ &PerlIO_APR);
}
@@ -437,8 +437,9 @@
/* ***** PerlIO <=> apr_file_t helper functions ***** */
-PerlIO *apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file, apr_pool_t *pool,
- apr_perlio_hook_e type)
+PerlIO *modperl_apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file,
+ apr_pool_t *pool,
+ modperl_apr_perlio_hook_e type)
{
char *mode;
const char *layers = ":APR";
@@ -450,14 +451,14 @@
}
switch (type) {
- case APR_PERLIO_HOOK_WRITE:
+ case MODPERL_APR_PERLIO_HOOK_WRITE:
mode = "w";
break;
- case APR_PERLIO_HOOK_READ:
+ case MODPERL_APR_PERLIO_HOOK_READ:
mode = "r";
break;
default:
- Perl_croak(aTHX_ "unknown APR_PERLIO type: %d", type);
+ Perl_croak(aTHX_ "unknown MODPERL_APR_PERLIO type: %d", type);
};
PerlIO_apply_layers(aTHX_ f, mode, layers);
@@ -490,7 +491,8 @@
return f;
}
-static SV *apr_perlio_PerlIO_to_glob(pTHX_ PerlIO *pio, apr_perlio_hook_e type)
+static SV *modperl_apr_perlio_PerlIO_to_glob(pTHX_ PerlIO *pio,
+ modperl_apr_perlio_hook_e type)
{
SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
GV *gv = (GV*)SvRV(retval);
@@ -498,14 +500,14 @@
gv_IOadd(gv);
switch (type) {
- case APR_PERLIO_HOOK_WRITE:
+ case MODPERL_APR_PERLIO_HOOK_WRITE:
/* if IoIFP() is not assigned to it'll be never closed, see
* Perl_io_close() */
IoIFP(GvIOp(gv)) = IoOFP(GvIOp(gv)) = pio;
IoFLAGS(GvIOp(gv)) |= IOf_FLUSH;
IoTYPE(GvIOp(gv)) = IoTYPE_WRONLY;
break;
- case APR_PERLIO_HOOK_READ:
+ case MODPERL_APR_PERLIO_HOOK_READ:
IoIFP(GvIOp(gv)) = pio;
IoTYPE(GvIOp(gv)) = IoTYPE_RDONLY;
break;
@@ -514,12 +516,12 @@
return sv_2mortal(retval);
}
-SV *apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file, apr_pool_t *pool,
- apr_perlio_hook_e type)
+SV *modperl_apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
+ apr_pool_t *pool,
+ modperl_apr_perlio_hook_e type)
{
- return apr_perlio_PerlIO_to_glob(aTHX_
- apr_perlio_apr_file_to_PerlIO(aTHX_ file,
- pool, type),
+ return modperl_apr_perlio_PerlIO_to_glob(aTHX_
+ modperl_apr_perlio_apr_file_to_PerlIO(aTHX_
file, pool, type),
type);
}
@@ -531,8 +533,8 @@
#define MP_IO_TYPE FILE
#endif
-static MP_IO_TYPE *apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file,
- apr_perlio_hook_e type)
+static MP_IO_TYPE *modperl_apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file,
+ modperl_apr_perlio_hook_e type)
{
MP_IO_TYPE *retval;
char *mode;
@@ -541,10 +543,10 @@
apr_status_t rc;
switch (type) {
- case APR_PERLIO_HOOK_WRITE:
+ case MODPERL_APR_PERLIO_HOOK_WRITE:
mode = "w";
break;
- case APR_PERLIO_HOOK_READ:
+ case MODPERL_APR_PERLIO_HOOK_READ:
mode = "r";
break;
};
@@ -581,8 +583,9 @@
return retval;
}
-SV *apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file, apr_pool_t *pool,
- apr_perlio_hook_e type)
+SV *modperl_apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
+ apr_pool_t *pool,
+ modperl_apr_perlio_hook_e type)
{
SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
GV *gv = (GV*)SvRV(retval);
@@ -590,14 +593,15 @@
gv_IOadd(gv);
switch (type) {
- case APR_PERLIO_HOOK_WRITE:
+ case MODPERL_APR_PERLIO_HOOK_WRITE:
IoIFP(GvIOp(gv)) = IoOFP(GvIOp(gv)) =
- apr_perlio_apr_file_to_PerlIO(aTHX_ file, type);
+ modperl_apr_perlio_apr_file_to_PerlIO(aTHX_ file, type);
IoFLAGS(GvIOp(gv)) |= IOf_FLUSH;
IoTYPE(GvIOp(gv)) = IoTYPE_WRONLY;
break;
- case APR_PERLIO_HOOK_READ:
- IoIFP(GvIOp(gv)) = apr_perlio_apr_file_to_PerlIO(aTHX_ file, type);
+ case MODPERL_APR_PERLIO_HOOK_READ:
+ IoIFP(GvIOp(gv)) = modperl_apr_perlio_apr_file_to_PerlIO(aTHX_ file,
+ type);
IoTYPE(GvIOp(gv)) = IoTYPE_RDONLY;
break;
};
@@ -605,9 +609,9 @@
return sv_2mortal(retval);
}
-void apr_perlio_init(pTHX)
+void modperl_apr_perlio_init(pTHX)
{
- APR_REGISTER_OPTIONAL_FN(apr_perlio_apr_file_to_glob);
+ APR_REGISTER_OPTIONAL_FN(modperl_apr_perlio_apr_file_to_glob);
}
#endif /* PERLIO_LAYERS */
1.3 +14 -12 modperl-2.0/xs/APR/PerlIO/modperl_apr_perlio.h
Index: modperl_apr_perlio.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/modperl_apr_perlio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modperl_apr_perlio.h 1 Jul 2004 01:44:42 -0000 1.2
+++ modperl_apr_perlio.h 9 Jul 2004 18:27:59 -0000 1.3
@@ -39,12 +39,12 @@
#endif
typedef enum {
- APR_PERLIO_HOOK_READ,
- APR_PERLIO_HOOK_WRITE
-} apr_perlio_hook_e;
+ MODPERL_APR_PERLIO_HOOK_READ,
+ MODPERL_APR_PERLIO_HOOK_WRITE
+} modperl_apr_perlio_hook_e;
#ifndef MP_SOURCE_SCAN
-void apr_perlio_init(pTHX);
+void modperl_apr_perlio_init(pTHX);
#endif
/* The following functions can be used from other .so libs, they just
@@ -53,21 +53,23 @@
#ifndef MP_SOURCE_SCAN
#ifdef PERLIO_LAYERS
-PerlIO *apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file, apr_pool_t *pool,
- apr_perlio_hook_e type);
+PerlIO *modperl_apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file,
+ apr_pool_t *pool,
+ modperl_apr_perlio_hook_e type);
APR_DECLARE_OPTIONAL_FN(PerlIO *,
- apr_perlio_apr_file_to_PerlIO,
+ modperl_apr_perlio_apr_file_to_PerlIO,
(pTHX_ apr_file_t *file, apr_pool_t *pool,
- apr_perlio_hook_e type));
+ modperl_apr_perlio_hook_e type));
#endif /* PERLIO_LAYERS */
-SV *apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file, apr_pool_t *pool,
- apr_perlio_hook_e type);
+SV *modperl_apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
+ apr_pool_t *pool,
+ modperl_apr_perlio_hook_e type);
APR_DECLARE_OPTIONAL_FN(SV *,
- apr_perlio_apr_file_to_glob,
+ modperl_apr_perlio_apr_file_to_glob,
(pTHX_ apr_file_t *file, apr_pool_t *pool,
- apr_perlio_hook_e type));
+ modperl_apr_perlio_hook_e type));
#endif /* MP_SOURCE_SCAN */
#endif /* MODPERL_APR_PERLIO_H */
1.14 +4 -4 modperl-2.0/xs/Apache/SubProcess/Apache__SubProcess.h
Index: Apache__SubProcess.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/SubProcess/Apache__SubProcess.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Apache__SubProcess.h 27 Jun 2004 23:41:07 -0000 1.13
+++ Apache__SubProcess.h 9 Jul 2004 18:27:59 -0000 1.14
@@ -18,7 +18,7 @@
#ifndef MP_SOURCE_SCAN
#include "apr_optional.h"
-static APR_OPTIONAL_FN_TYPE(apr_perlio_apr_file_to_glob) *apr_file_to_glob;
+static APR_OPTIONAL_FN_TYPE(modperl_apr_perlio_apr_file_to_glob) *apr_file_to_glob;
#endif
/* XXX: probably needs a lot more error checkings */
@@ -117,10 +117,10 @@
PUSHs(apr_file_to_glob(aTHX_ fp, r->pool, type))
#define PUSH_FILE_GLOB_READ(fp) \
- PUSH_FILE_GLOB(fp, APR_PERLIO_HOOK_READ)
+ PUSH_FILE_GLOB(fp, MODPERL_APR_PERLIO_HOOK_READ)
#define PUSH_FILE_GLOB_WRITE(fp) \
- PUSH_FILE_GLOB(fp, APR_PERLIO_HOOK_WRITE)
+ PUSH_FILE_GLOB(fp, MODPERL_APR_PERLIO_HOOK_WRITE)
static XS(MPXS_modperl_spawn_proc_prog)
{
@@ -178,7 +178,7 @@
if (rc == APR_SUCCESS) {
/* XXX: apr_file_to_glob should be set once in the BOOT: section */
apr_file_to_glob =
- APR_RETRIEVE_OPTIONAL_FN(apr_perlio_apr_file_to_glob);
+ APR_RETRIEVE_OPTIONAL_FN(modperl_apr_perlio_apr_file_to_glob);
if (GIMME == G_SCALAR) {
/* XXX: need to do lots of error checking before
1.41 +1 -1 modperl-2.0/xs/tables/current/Apache/StructureTable.pm
Index: StructureTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/StructureTable.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- StructureTable.pm 1 Jul 2004 01:43:19 -0000 1.40
+++ StructureTable.pm 9 Jul 2004 18:27:59 -0000 1.41
@@ -1996,7 +1996,7 @@
'elts' => []
},
{
- 'type' => 'apr_perlio_hook_e',
+ 'type' => 'modperl_apr_perlio_hook_e',
'elts' => []
},
{
