dougm 01/08/08 09:20:32
Modified: src/modules/perl mod_perl.c modperl_cmd.c modperl_config.c
modperl_config.h modperl_util.c
Log:
fixup some style nits
use Perl_require_pv rather than copy-n-paste of its code in modperl_require_file
Revision Changes Path
1.62 +4 -4 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mod_perl.c 2001/08/08 07:02:41 1.61
+++ mod_perl.c 2001/08/08 16:20:31 1.62
@@ -74,10 +74,10 @@
);
#endif
- if (!modperl_config_apply_PerlModule(s, scfg, perl, p)){
+ if (!modperl_config_apply_PerlModule(s, scfg, perl, p)) {
exit(1);
}
- if (!modperl_config_apply_PerlRequire(s, scfg, perl, p)){
+ if (!modperl_config_apply_PerlRequire(s, scfg, perl, p)) {
exit(1);
}
@@ -133,10 +133,10 @@
modperl_server_desc(s, p));
}
- if (!modperl_config_apply_PerlModule(s, scfg, perl, p)){
+ if (!modperl_config_apply_PerlModule(s, scfg, perl, p)) {
exit(1);
}
- if (!modperl_config_apply_PerlRequire(s, scfg, perl, p)){
+ if (!modperl_config_apply_PerlRequire(s, scfg, perl, p)) {
exit(1);
}
1.6 +0 -2 modperl-2.0/src/modules/perl/modperl_cmd.c
Index: modperl_cmd.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modperl_cmd.c 2001/08/08 07:02:41 1.5
+++ modperl_cmd.c 2001/08/08 16:20:31 1.6
@@ -47,7 +47,6 @@
MP_CMD_SRV_DECLARE(modules)
{
MP_dSCFG(parms->server);
-
*(const char **)apr_array_push(scfg->PerlModule) = arg;
MP_TRACE_d(MP_FUNC, "arg = %s\n", arg);
return NULL;
@@ -56,7 +55,6 @@
MP_CMD_SRV_DECLARE(requires)
{
MP_dSCFG(parms->server);
-
*(const char **)apr_array_push(scfg->PerlRequire) = arg;
MP_TRACE_d(MP_FUNC, "arg = %s\n", arg);
return NULL;
1.34 +6 -2 modperl-2.0/src/modules/perl/modperl_config.c
Index: modperl_config.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- modperl_config.c 2001/08/08 07:02:41 1.33
+++ modperl_config.c 2001/08/08 16:20:31 1.34
@@ -189,7 +189,9 @@
return mrg;
}
-int modperl_config_apply_PerlModule(server_rec *s, modperl_config_srv_t *scfg,
PerlInterpreter *perl, apr_pool_t *p)
+int modperl_config_apply_PerlModule(server_rec *s,
+ modperl_config_srv_t *scfg,
+ PerlInterpreter *perl, apr_pool_t *p)
{
char **entries;
int i;
@@ -212,7 +214,9 @@
return TRUE;
}
-int modperl_config_apply_PerlRequire(server_rec *s, modperl_config_srv_t *scfg,
PerlInterpreter *perl, apr_pool_t *p)
+int modperl_config_apply_PerlRequire(server_rec *s,
+ modperl_config_srv_t *scfg,
+ PerlInterpreter *perl, apr_pool_t *p)
{
char **entries;
int i;
1.27 +7 -2 modperl-2.0/src/modules/perl/modperl_config.h
Index: modperl_config.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- modperl_config.h 2001/08/08 07:02:41 1.26
+++ modperl_config.h 2001/08/08 16:20:31 1.27
@@ -59,7 +59,12 @@
# define MP_dSCFG_dTHX dTHXa(scfg->perl)
#endif
-int modperl_config_apply_PerlModule(server_rec *s, modperl_config_srv_t *scfg,
PerlInterpreter *perl, apr_pool_t *p);
-int modperl_config_apply_PerlRequire(server_rec *s, modperl_config_srv_t *scfg,
PerlInterpreter *perl, apr_pool_t *p);
+int modperl_config_apply_PerlModule(server_rec *s,
+ modperl_config_srv_t *scfg,
+ PerlInterpreter *perl, apr_pool_t *p);
+
+int modperl_config_apply_PerlRequire(server_rec *s,
+ modperl_config_srv_t *scfg,
+ PerlInterpreter *perl, apr_pool_t *p);
#endif /* MODPERL_CONFIG_H */
1.17 +1 -12 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_util.c 2001/08/08 07:02:41 1.16
+++ modperl_util.c 2001/08/08 16:20:32 1.17
@@ -27,18 +27,7 @@
int modperl_require_file(pTHX_ const char *pv, int logfailure)
{
- SV *sv;
-
- dSP;
- PUSHSTACKi(PERLSI_REQUIRE);
- PUTBACK;
- sv = sv_newmortal();
- sv_setpv(sv, "require \"");
- sv_catpv(sv, pv);
- sv_catpv(sv, "\"");
- eval_sv(sv, G_DISCARD);
- SPAGAIN;
- POPSTACK;
+ require_pv(pv);
if (SvTRUE(ERRSV)) {
if (logfailure) {
