[prev in list] [next in list] [prev in thread] [next in thread]
List: apache-modperl-cvs
Subject: svn commit: r1362399 - in /perl/modperl/trunk: lib/ModPerl/ src/modules/perl/ xs/ xs/APR/Brigade/ xs
From: stevehay () apache ! org
Date: 2012-07-17 8:14:59
Message-ID: 20120717081501.C76F1238897D () eris ! apache ! org
[Download RAW message or body]
Author: stevehay
Date: Tue Jul 17 08:14:58 2012
New Revision: 1362399
URL: http://svn.apache.org/viewvc?rev=1362399&view=rev
Log:
Remove all uses of deprecated symbols no longer used by core perl and now only \
defined when PERL_CORE is not defined for backwards compatibility with CPAN \
extensions still making use of them: MEMBER_TO_FPTR, New, NEWSV, Newz, Null, Nullav, \
Nullch, Nullcv, Nullfp, Nullgv, Nullhv, Nullsv, PL_dirty, PL_na.
We actually (and arguably, wrongly) define PERL_CORE for an optimization in certain \
cases (but not when large files support is enabled, hence this doesn't happen often) \
and therefore don't get the definitions of these legacy symbols in that case. This \
commit fixes that, so that mod_perl can once again be built without large files \
support, but ideally our usage of PERL_CORE should be removed anyway.
Modified:
perl/modperl/trunk/lib/ModPerl/WrapXS.pm
perl/modperl/trunk/src/modules/perl/mod_perl.c
perl/modperl/trunk/src/modules/perl/modperl_callback.c
perl/modperl/trunk/src/modules/perl/modperl_cmd.c
perl/modperl/trunk/src/modules/perl/modperl_common_util.c
perl/modperl/trunk/src/modules/perl/modperl_const.c
perl/modperl/trunk/src/modules/perl/modperl_env.c
perl/modperl/trunk/src/modules/perl/modperl_env.h
perl/modperl/trunk/src/modules/perl/modperl_error.c
perl/modperl/trunk/src/modules/perl/modperl_filter.c
perl/modperl/trunk/src/modules/perl/modperl_handler.c
perl/modperl/trunk/src/modules/perl/modperl_io.c
perl/modperl/trunk/src/modules/perl/modperl_io_apache.c
perl/modperl/trunk/src/modules/perl/modperl_mgv.c
perl/modperl/trunk/src/modules/perl/modperl_module.c
perl/modperl/trunk/src/modules/perl/modperl_perl_global.c
perl/modperl/trunk/src/modules/perl/modperl_perl_pp.c
perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c
perl/modperl/trunk/src/modules/perl/modperl_util.c
perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h
perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h
perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h
perl/modperl/trunk/xs/APR/Error/Error_pm
perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h
perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h
perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c
perl/modperl/trunk/xs/APR/Pool/APR__Pool.h
perl/modperl/trunk/xs/APR/Table/APR__Table.h
perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h
perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h
perl/modperl/trunk/xs/APR/URI/APR__URI.h
perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h
perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h
perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h
perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h
perl/modperl/trunk/xs/maps/apr_functions.map
perl/modperl/trunk/xs/maps/modperl_functions.map
perl/modperl/trunk/xs/modperl_xs_util.h
Modified: perl/modperl/trunk/lib/ModPerl/WrapXS.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/WrapXS.pm?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/WrapXS.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/WrapXS.pm Tue Jul 17 08:14:58 2012
@@ -272,7 +272,7 @@ EOF
$code = <<EOF;
$type
-$name(obj, val=Nullsv)
+$name(obj, val=(SV *)NULL)
$class obj
SV *val
@@ -300,10 +300,10 @@ EOF
or die "rw_char_undef accessors need pool";
$pool .= '(obj)';
# XXX: not sure where val=$default is coming from, but for now use
-# hardcoded Nullsv
+# hardcoded (SV *)NULL
$code = <<EOF;
$type
-$name(obj, val_sv=Nullsv)
+$name(obj, val_sv=(SV *)NULL)
$class obj
SV *val_sv
Modified: perl/modperl/trunk/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/mod_perl.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.c Tue Jul 17 08:14:58 2012
@@ -262,7 +262,7 @@ PerlInterpreter *modperl_startup(server_
/* suspend END blocks to be run at server shutdown */
endav = PL_endav;
- PL_endav = Nullav;
+ PL_endav = (AV *)NULL;
/* This was fixed in 5.9.0/5.8.1 (17775), but won't compile after 19122 */
#if MP_PERL_VERSION(5, 8, 0) && \
Modified: perl/modperl/trunk/src/modules/perl/modperl_callback.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_callback.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_callback.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_callback.c Tue Jul 17 08:14:58 2012
@@ -19,7 +19,7 @@
int modperl_callback(pTHX_ modperl_handler_t *handler, apr_pool_t *p,
request_rec *r, server_rec *s, AV *args)
{
- CV *cv = Nullcv;
+ CV *cv = (CV *)NULL;
I32 flags = G_EVAL|G_SCALAR;
dSP;
int count, status = OK;
@@ -28,8 +28,8 @@ int modperl_callback(pTHX_ modperl_handl
* state, so start every callback with a clear tainted status
* before and after the callback one of the main problems we are
* trying to solve is that when modperl_croak called (which calls
- * perl's croak(Nullch) to throw an error object) it leaves the
- * interpreter in the tainted state which later affects other
+ * perl's croak((char *)NULL) to throw an error object) it leaves
+ * the interpreter in the tainted state which later affects other
* callbacks that call eval, etc., which triggers perl crash with:
* Insecure dependency in eval while running setgid. Callback
* called exit.
@@ -160,7 +160,7 @@ int modperl_callback_run_handlers(int id
MpAV *av, **avp;
int i, status = OK;
const char *desc = NULL;
- AV *av_args = Nullav;
+ AV *av_args = (AV *)NULL;
if (!MpSrvENABLE(scfg)) {
MP_TRACE_h(MP_FUNC, "PerlOff for server %s:%u",
Modified: perl/modperl/trunk/src/modules/perl/modperl_cmd.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_cmd.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_cmd.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_cmd.c Tue Jul 17 08:14:58 2012
@@ -584,7 +584,7 @@ MP_CMD_SRV_DECLARE(perldo)
if (handler) {
int status;
SV *saveconfig = MP_PERLSECTIONS_SAVECONFIG_SV;
- AV *args = Nullav;
+ AV *args = (AV *)NULL;
modperl_handler_make_args(aTHX_ &args,
"Apache2::CmdParms", parms,
Modified: perl/modperl/trunk/src/modules/perl/modperl_common_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_common_util.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_common_util.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_common_util.c Tue Jul 17 08:14:58 \
2012 @@ -69,13 +69,13 @@ MP_INLINE SV *modperl_hash_tie(pTHX_
/* Prefetch magic requires perl 5.8 */
#if MP_PERL_VERSION_AT_LEAST(5, 8, 0)
- sv_magicext(hv, NULL, PERL_MAGIC_ext, NULL, Nullch, -1);
+ sv_magicext(hv, NULL, PERL_MAGIC_ext, NULL, (char *)NULL, -1);
SvMAGIC(hv)->mg_virtual = (MGVTBL *)&modperl_table_magic_prefetch;
SvMAGIC(hv)->mg_flags |= MGf_COPY;
#endif /* End of prefetch magic */
- sv_magic(hv, rsv, PERL_MAGIC_tied, Nullch, 0);
+ sv_magic(hv, rsv, PERL_MAGIC_tied, (char *)NULL, 0);
return SvREFCNT_inc(sv_bless(sv_2mortal(newRV_noinc(hv)),
gv_stashpv(classname, TRUE)));
Modified: perl/modperl/trunk/src/modules/perl/modperl_const.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_const.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_const.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_const.c Tue Jul 17 08:14:58 2012
@@ -64,7 +64,7 @@ int modperl_const_compile(pTHX_ const ch
const char *name)
{
HV *stash = gv_stashpv(classname, TRUE);
- HV *caller_stash = Nullhv;
+ HV *caller_stash = (HV *)NULL;
constants_lookup lookup;
constants_group_lookup group_lookup;
Modified: perl/modperl/trunk/src/modules/perl/modperl_env.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_env.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_env.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_env.c Tue Jul 17 08:14:58 2012
@@ -627,17 +627,17 @@ static int modperl_env_magic_get(pTHX_ S
/* override %ENV virtual tables with our own */
static MGVTBL MP_vtbl_env = {
0,
- MEMBER_TO_FPTR(modperl_env_magic_set_all),
+ modperl_env_magic_set_all,
0,
- MEMBER_TO_FPTR(modperl_env_magic_clear_all),
+ modperl_env_magic_clear_all,
0
};
static MGVTBL MP_vtbl_envelem = {
0,
- MEMBER_TO_FPTR(modperl_env_magic_set),
+ modperl_env_magic_set,
0,
- MEMBER_TO_FPTR(modperl_env_magic_clear),
+ modperl_env_magic_clear,
0
};
Modified: perl/modperl/trunk/src/modules/perl/modperl_env.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_env.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_env.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_env.h Tue Jul 17 08:14:58 2012
@@ -28,7 +28,7 @@
MP_magical_tie(ENVHV, mg_flags)
#define modperl_envelem_tie(sv, key, klen) \
- sv_magic(sv, Nullsv, 'e', key, klen)
+ sv_magic(sv, (SV *)NULL, 'e', key, klen)
void modperl_env_hash_keys(pTHX);
Modified: perl/modperl/trunk/src/modules/perl/modperl_error.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_error.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_error.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_error.c Tue Jul 17 08:14:58 2012
@@ -78,7 +78,7 @@ void modperl_croak(pTHX_ apr_status_t rc
}
if (SvTRUE(ERRSV)) {
- Perl_croak(aTHX_ Nullch);
+ Perl_croak(aTHX_ (char *)NULL);
}
stash = gv_stashpvn("APR::Error", 10, FALSE);
@@ -91,5 +91,5 @@ void modperl_croak(pTHX_ apr_status_t rc
sv_setiv(*hv_fetch(data, "line", 4, 1), CopLINE(PL_curcop));
sv_setpv(*hv_fetch(data, "func", 4, 1), func);
- Perl_croak(aTHX_ Nullch);
+ Perl_croak(aTHX_ (char *)NULL);
}
Modified: perl/modperl/trunk/src/modules/perl/modperl_filter.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_filter.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_filter.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_filter.c Tue Jul 17 08:14:58 2012
@@ -355,7 +355,7 @@ modperl_filter_t *modperl_filter_new(ap_
static void modperl_filter_mg_set(pTHX_ SV *obj, modperl_filter_t *filter)
{
- sv_magic(SvRV(obj), Nullsv, PERL_MAGIC_ext, NULL, -1);
+ sv_magic(SvRV(obj), (SV *)NULL, PERL_MAGIC_ext, NULL, -1);
SvMAGIC(SvRV(obj))->mg_ptr = (char *)filter;
}
@@ -431,7 +431,7 @@ static int modperl_run_filter_init(ap_fi
modperl_filter_mode_e mode,
modperl_handler_t *handler)
{
- AV *args = Nullav;
+ AV *args = (AV *)NULL;
int status;
request_rec *r = f->r;
@@ -474,8 +474,8 @@ static int modperl_run_filter_init(ap_fi
int modperl_run_filter(modperl_filter_t *filter)
{
- AV *args = Nullav;
- SV *errsv = Nullsv;
+ AV *args = (AV *)NULL;
+ SV *errsv = (SV *)NULL;
int status;
modperl_handler_t *handler =
((modperl_filter_ctx_t *)filter->f->ctx)->handler;
Modified: perl/modperl/trunk/src/modules/perl/modperl_handler.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_handler.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_handler.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_handler.c Tue Jul 17 08:14:58 2012
@@ -317,7 +317,7 @@ void modperl_handler_make_args(pTHX_ AV
switch (*classname) {
case 'A':
if (strEQ(classname, "APR::Table")) {
- sv = modperl_hash_tie(aTHX_ classname, Nullsv, ptr);
+ sv = modperl_hash_tie(aTHX_ classname, (SV *)NULL, ptr);
break;
}
case 'I':
@@ -608,7 +608,7 @@ int modperl_handler_perl_add_handlers(pT
modperl_handler_action_e action)
{
I32 i;
- AV *av = Nullav;
+ AV *av = (AV *)NULL;
MpAV **handlers =
modperl_handler_get_handlers(r, c, s,
p, name, action);
Modified: perl/modperl/trunk/src/modules/perl/modperl_io.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_io.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_io.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_io.c Tue Jul 17 08:14:58 2012
@@ -29,7 +29,7 @@ MP_INLINE void modperl_io_handle_tie(pTH
modperl_io_handle_untie(aTHX_ handle);
- sv_magic(TIEHANDLE_SV(handle), obj, PERL_MAGIC_tiedscalar, Nullch, 0);
+ sv_magic(TIEHANDLE_SV(handle), obj, PERL_MAGIC_tiedscalar, (char *)NULL, 0);
SvREFCNT_dec(obj); /* since sv_magic did SvREFCNT_inc */
@@ -117,7 +117,7 @@ modperl_io_perlio_override_stdhandle(pTH
sv_setref_pv(sv, "Apache2::RequestRec", (void*)r);
status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2",
- 9, FALSE, mode, 0, Nullfp, sv, 1);
+ 9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1);
if (status == 0) {
Perl_croak(aTHX_ "Failed to open STD%s: %" SVf,
mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE));
Modified: perl/modperl/trunk/src/modules/perl/modperl_io_apache.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_io_apache.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_io_apache.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_io_apache.c Tue Jul 17 08:14:58 2012
@@ -70,7 +70,7 @@ PerlIOApache_pushed(pTHX_ PerlIO *f, con
/* this method also sets the right flags according to the
* 'mode' */
- code = PerlIOBase_pushed(aTHX_ f, mode, Nullsv, tab);
+ code = PerlIOBase_pushed(aTHX_ f, mode, (SV *)NULL, tab);
return code;
}
Modified: perl/modperl/trunk/src/modules/perl/modperl_mgv.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_mgv.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_mgv.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_mgv.c Tue Jul 17 08:14:58 2012
@@ -138,11 +138,11 @@ GV *modperl_mgv_lookup(pTHX_ modperl_mgv
}
}
else {
- return Nullgv;
+ return (GV *)NULL;
}
}
- return Nullgv;
+ return (GV *)NULL;
}
#ifdef USE_ITHREADS
@@ -184,7 +184,7 @@ int modperl_mgv_resolve(pTHX_ modperl_ha
{
CV *cv;
GV *gv;
- HV *stash = Nullhv;
+ HV *stash = (HV *)NULL;
char *handler_name = "handler";
char *tmp;
@@ -241,7 +241,7 @@ int modperl_mgv_resolve(pTHX_ modperl_ha
handler->mgv_obj = modperl_mgv_compile(aTHX_ p, package + 1);
gv = modperl_mgv_lookup(aTHX_ handler->mgv_obj);
- obj = gv ? GvSV(gv) : Nullsv;
+ obj = gv ? GvSV(gv) : (SV *)NULL;
if (SvTRUE(obj)) {
if (SvROK(obj) && sv_isobject(obj)) {
Modified: perl/modperl/trunk/src/modules/perl/modperl_module.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_module.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_module.c Tue Jul 17 08:14:58 2012
@@ -165,7 +165,7 @@ static void *modperl_module_config_merge
server_rec *s;
int is_startup;
PTR_TBL_t *table;
- SV *mrg_obj = Nullsv, *base_obj, *add_obj;
+ SV *mrg_obj = (SV *)NULL, *base_obj, *add_obj;
#ifdef USE_ITHREADS
modperl_interp_t *interp;
MP_PERL_CONTEXT_DECLARE;
@@ -371,7 +371,7 @@ static const char *modperl_module_cmd_ta
int count;
PTR_TBL_t *table = modperl_module_config_table_get(aTHX_ TRUE);
- SV *obj = Nullsv;
+ SV *obj = (SV *)NULL;
dSP;
if (s->is_virtual) {
@@ -584,7 +584,7 @@ static const char *modperl_module_cmd_fe
if (*retval) {
SvREFCNT_dec(*retval);
- *retval = Nullsv;
+ *retval = (SV *)NULL;
}
if (sv_isobject(obj)) {
@@ -654,7 +654,7 @@ static const char *modperl_module_add_cm
cmds = apr_array_make(p, fill+1, sizeof(command_rec));
for (i=0; i<=fill; i++) {
- SV *val = Nullsv;
+ SV *val = (SV *)NULL;
STRLEN len;
SV *obj = AvARRAY(module_cmds)[i];
modperl_module_cmd_data_t *info = modperl_module_cmd_data_new(p);
@@ -727,7 +727,7 @@ static const char *modperl_module_add_cm
if (val) {
SvREFCNT_dec(val);
- val = Nullsv;
+ val = (SV *)NULL;
}
}
Modified: perl/modperl/trunk/src/modules/perl/modperl_perl_global.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_perl_global.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl_global.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl_global.c Tue Jul 17 08:14:58 \
2012 @@ -69,7 +69,7 @@ static void modperl_perl_global_init(pTH
* return $PL_modglobal{$key}{$package} = [];
* }
* else {
- * return $Nullav; # a null pointer in C of course :)
+ * return (AV *)NULL; # a null pointer in C of course :)
* }
*/
static AV *modperl_perl_global_avcv_fetch(pTHX_ modperl_modglobal_key_t *gkey,
@@ -84,7 +84,7 @@ static AV *modperl_perl_global_avcv_fetc
hv = MP_MODGLOBAL_STORE_HV(gkey);
}
else {
- return Nullav;
+ return (AV *)NULL;
}
}
@@ -96,7 +96,7 @@ static AV *modperl_perl_global_avcv_fetc
return (AV*)*hv_store(hv, package, packlen, (SV*)newAV(), 0);
}
else {
- return Nullav;
+ return (AV *)NULL;
}
}
}
@@ -202,7 +202,7 @@ static int modperl_perl_global_avcv_set(
static MGVTBL modperl_vtbl_global_avcv_t = {
0,
- MEMBER_TO_FPTR(modperl_perl_global_avcv_set),
+ modperl_perl_global_avcv_set,
0, 0, 0,
};
@@ -211,7 +211,7 @@ static void modperl_perl_global_avcv_tie
{
if (!SvMAGIC((SV*)av)) {
MAGIC *mg;
- Newz(702, mg, 1, MAGIC);
+ Newxz(mg, 1, MAGIC);
mg->mg_virtual = &modperl_vtbl_global_avcv_t;
mg->mg_ptr = (char *)&MP_modglobal_keys[key];
mg->mg_len = -1; /* prevent free() of mg->mg_ptr */
@@ -279,7 +279,7 @@ static HV *copyENV(pTHX_ HV *ohv)
HvRITER(ohv) = hv_riter;
HvEITER(ohv) = hv_eiter;
- hv_magic(hv, Nullgv, 'E');
+ hv_magic(hv, (GV *)NULL, 'E');
TAINT_NOT;
@@ -316,7 +316,7 @@ modperl_perl_global_gvhv_save(pTHX_ modp
if (mg && mg->mg_type && !SvMAGIC(gvhv->tmphv)) {
/* propagate SvMAGIC(hv) to SvMAGIC(gvhv->tmphv) */
/* XXX: maybe newHVhv should do this? */
- hv_magic(gvhv->tmphv, Nullgv, mg->mg_type);
+ hv_magic(gvhv->tmphv, (GV *)NULL, mg->mg_type);
}
#else
gvhv->tmphv = copyENV(aTHX_ hv);
Modified: perl/modperl/trunk/src/modules/perl/modperl_perl_pp.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_perl_pp.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl_pp.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl_pp.c Tue Jul 17 08:14:58 2012
@@ -48,7 +48,7 @@ static OP *modperl_pp_srefgen(pTHX)
SvPADTMP_off(sv);
}
else {
- sv = Nullsv;
+ sv = (SV *)NULL;
}
/* o = Perl_pp_srefgen(aTHX) */
@@ -72,9 +72,9 @@ static OP *modperl_pp_require(pTHX)
static modperl_pp_t MP_ppaddr[] = {
#ifdef MP_REFGEN_FIXUP
- MEMBER_TO_FPTR(modperl_pp_srefgen),
+ modperl_pp_srefgen,
#endif
- MEMBER_TO_FPTR(modperl_pp_require)
+ modperl_pp_require
};
void modperl_perl_pp_set(modperl_perl_opcode_e idx)
Modified: perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c Tue Jul 17 08:14:58 \
2012 @@ -58,10 +58,10 @@ PTR_TBL_t *modperl_svptr_table_clone(pTH
PTR_TBL_ENT_t **src_ary, **dst_ary;
CLONE_PARAMS parms;
- Newz(0, tbl, 1, PTR_TBL_t);
+ Newxz(tbl, 1, PTR_TBL_t);
tbl->tbl_max = source->tbl_max;
tbl->tbl_items = source->tbl_items;
- Newz(0, tbl->tbl_ary, tbl->tbl_max + 1, PTR_TBL_ENT_t *);
+ Newxz(tbl->tbl_ary, tbl->tbl_max + 1, PTR_TBL_ENT_t *);
dst_ary = tbl->tbl_ary;
src_ary = source->tbl_ary;
@@ -82,11 +82,11 @@ PTR_TBL_t *modperl_svptr_table_clone(pTH
src_ent = src_ent->next)
{
if (dst_ent == NULL) {
- Newz(0, dst_ent, 1, PTR_TBL_ENT_t);
+ Newxz(dst_ent, 1, PTR_TBL_ENT_t);
*dst_ary = dst_ent;
}
else {
- Newz(0, dst_ent->next, 1, PTR_TBL_ENT_t);
+ Newxz(dst_ent->next, 1, PTR_TBL_ENT_t);
dst_ent = dst_ent->next;
}
@@ -170,10 +170,10 @@ PTR_TBL_t *
modperl_svptr_table_new(pTHX)
{
PTR_TBL_t *tbl;
- Newz(0, tbl, 1, PTR_TBL_t);
+ Newxz(tbl, 1, PTR_TBL_t);
tbl->tbl_max = 511;
tbl->tbl_items = 0;
- Newz(0, tbl->tbl_ary, tbl->tbl_max + 1, PTR_TBL_ENT_t*);
+ Newxz(tbl->tbl_ary, tbl->tbl_max + 1, PTR_TBL_ENT_t*);
return tbl;
}
@@ -213,7 +213,7 @@ modperl_svptr_table_store(pTHX_ PTR_TBL_
return;
}
}
- Newz(0, tblent, 1, PTR_TBL_ENT_t);
+ Newxz(tblent, 1, PTR_TBL_ENT_t);
tblent->oldval = oldv;
tblent->newval = newv;
tblent->next = *otblent;
@@ -262,7 +262,7 @@ modperl_svptr_table_clear(pTHX_ PTR_TBL_
{
register PTR_TBL_ENT_t **array;
register PTR_TBL_ENT_t *entry;
- register PTR_TBL_ENT_t *oentry = Null(PTR_TBL_ENT_t*);
+ register PTR_TBL_ENT_t *oentry = (PTR_TBL_ENT_t *)NULL;
UV riter = 0;
UV max;
Modified: perl/modperl/trunk/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_util.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_util.c Tue Jul 17 08:14:58 2012
@@ -62,7 +62,7 @@ static SV *modperl_hv_request_find(pTHX_
{
static char *r_keys[] = { "r", "_r", NULL };
HV *hv = (HV *)SvRV(in);
- SV *sv = Nullsv;
+ SV *sv = (SV *)NULL;
int i;
for (i=0; r_keys[i]; i++) {
@@ -117,12 +117,12 @@ MP_INLINE server_rec *modperl_sv2server_
MP_INLINE request_rec *modperl_sv2request_rec(pTHX_ SV *sv)
{
- return modperl_xs_sv2request_rec(aTHX_ sv, NULL, Nullcv);
+ return modperl_xs_sv2request_rec(aTHX_ sv, NULL, (CV *)NULL);
}
request_rec *modperl_xs_sv2request_rec(pTHX_ SV *in, char *classname, CV *cv)
{
- SV *sv = Nullsv;
+ SV *sv = (SV *)NULL;
MAGIC *mg;
if (SvROK(in)) {
@@ -177,7 +177,7 @@ MP_INLINE SV *modperl_newSVsv_obj(pTHX_
if (!obj) {
obj = stashsv;
- stashsv = Nullsv;
+ stashsv = (SV *)NULL;
}
newobj = newSVsv(obj);
@@ -458,7 +458,7 @@ void modperl_perl_do_sprintf(pTHX_ SV *s
char *pat = SvPV(*sarg, patlen);
bool do_taint = FALSE;
- sv_vsetpvfn(sv, pat, patlen, Null(va_list*), sarg + 1, len - 1, &do_taint);
+ sv_vsetpvfn(sv, pat, patlen, (va_list *)NULL, sarg + 1, len - 1, &do_taint);
SvSETMAGIC(sv);
if (do_taint) {
SvTAINTED_on(sv);
@@ -497,7 +497,7 @@ void modperl_perl_exit(pTHX_ int status)
{
ENTER;
SAVESPTR(PL_diehook);
- PL_diehook = Nullsv;
+ PL_diehook = (SV *)NULL;
modperl_croak(aTHX_ MODPERL_RC_EXIT, "ModPerl::Util::exit");
}
@@ -537,7 +537,7 @@ SV *modperl_table_get_set(pTHX_ apr_tabl
}
else if (key == NULL) {
retval = modperl_hash_tie(aTHX_ "APR::Table",
- Nullsv, (void*)table);
+ (SV *)NULL, (void*)table);
}
else if (!sv_val) { /* no val was passed */
char *val;
@@ -735,7 +735,7 @@ apr_array_header_t *modperl_avrv2apr_arr
for (i = 0; i <= av_size; i++) {
SV *sv = *av_fetch(av, i, FALSE);
char **entry = (char **)apr_array_push(array);
- *entry = apr_pstrdup(p, SvPV(sv, PL_na));
+ *entry = apr_pstrdup(p, SvPV_nolen(sv));
}
return array;
@@ -850,7 +850,7 @@ apr_status_t modperl_cleanup_pnotes(void
pnotes = data;
#endif
SvREFCNT_dec(*pnotes);
- *pnotes = Nullhv;
+ *pnotes = (HV *)NULL;
}
return APR_SUCCESS;
@@ -870,7 +870,7 @@ static void *modperl_pnotes_cleanup_data
SV *modperl_pnotes(pTHX_ HV **pnotes, SV *key, SV *val,
request_rec *r, conn_rec *c) {
- SV *retval = Nullsv;
+ SV *retval = (SV *)NULL;
if (!*pnotes) {
apr_pool_t *pool = r ? r->pool : c->pool;
@@ -904,7 +904,7 @@ U16 *modperl_code_attrs(pTHX_ CV *cv) {
MAGIC *mg;
if (!SvMAGICAL(cv)) {
- sv_magic((SV*)cv, Nullsv, PERL_MAGIC_ext, NULL, -1);
+ sv_magic((SV*)cv, (SV *)NULL, PERL_MAGIC_ext, NULL, -1);
}
mg = mg_find((SV*)cv, PERL_MAGIC_ext);
Modified: perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h (original)
+++ perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h Tue Jul 17 08:14:58 2012
@@ -28,7 +28,7 @@ SV *mpxs_apr_brigade_create(pTHX_ SV *CL
{
apr_pool_t *p = mp_xs_sv2_APR__Pool(p_sv);
apr_bucket_brigade *bb = apr_brigade_create(p, ba);
- SV *bb_sv = sv_setref_pv(NEWSV(0, 0), "APR::Brigade", (void*)bb);
+ SV *bb_sv = sv_setref_pv(newSV(0), "APR::Brigade", (void*)bb);
mpxs_add_pool_magic(bb_sv, p_sv);
return bb_sv;
}
Modified: perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h (original)
+++ perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h Tue Jul 17 08:14:58 2012
@@ -25,7 +25,7 @@ static apr_bucket *mpxs_APR__Bucket_new(
apr_size_t full_len;
- if (sv == Nullsv) {
+ if (sv == (SV *)NULL) {
sv = newSV(0);
(void)SvUPGRADE(sv, SVt_PV);
}
Modified: perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h (original)
+++ perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h Tue Jul 17 08:14:58 2012
@@ -23,7 +23,7 @@ SV *mpxs_APR__BucketAlloc_new(pTHX_ SV *
{
apr_pool_t *p = mp_xs_sv2_APR__Pool(p_sv);
apr_bucket_alloc_t *ba = apr_bucket_alloc_create(p);
- SV *ba_sv = sv_setref_pv(NEWSV(0, 0), "APR::BucketAlloc", (void*)ba);
+ SV *ba_sv = sv_setref_pv(newSV(0), "APR::BucketAlloc", (void*)ba);
mpxs_add_pool_magic(ba_sv, p_sv);
return ba_sv;
}
Modified: perl/modperl/trunk/xs/APR/Error/Error_pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Error/Error_pm?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Error/Error_pm (original)
+++ perl/modperl/trunk/xs/APR/Error/Error_pm Tue Jul 17 08:14:58 2012
@@ -45,7 +45,7 @@ sub num_cmp_not { $_[0]->{rc} != $_[1] }
$Carp::CarpInternal{+__PACKAGE__}++;
# XXX: Carp::(confess|cluck) see no calls stack when Perl_croak is
-# called with Nullch (which is the way exception objects are
+# called with (char *)NULL (which is the way exception objects are
# returned), so we fixup it here (doesn't quite work for croak
# caller).
sub cluck {
Modified: perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h (original)
+++ perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h Tue Jul 17 08:14:58 2012
@@ -25,7 +25,7 @@ SV *mpxs_APR__Finfo_stat(pTHX_ const cha
MP_RUN_CROAK(apr_stat(finfo, fname, wanted, p),
"APR::Finfo::stat");
- finfo_sv = sv_setref_pv(NEWSV(0, 0), "APR::Finfo", (void*)finfo);
+ finfo_sv = sv_setref_pv(newSV(0), "APR::Finfo", (void*)finfo);
mpxs_add_pool_magic(finfo_sv, p_sv);
return finfo_sv;
Modified: perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h (original)
+++ perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h Tue Jul 17 08:14:58 2012
@@ -24,7 +24,7 @@ SV *mpxs_apr_ipsubnet_create(pTHX_ SV *c
SV *ipsub_sv;
MP_RUN_CROAK(apr_ipsubnet_create(&ipsub, ipstr, mask_or_numbits, p),
"APR::IpSubnet::new");
- ipsub_sv = sv_setref_pv(NEWSV(0, 0), "APR::IpSubnet", (void*)ipsub);
+ ipsub_sv = sv_setref_pv(newSV(0), "APR::IpSubnet", (void*)ipsub);
mpxs_add_pool_magic(ipsub_sv, p_sv);
return ipsub_sv;
}
Modified: perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c Tue Jul 17 08:14:58 2012
@@ -289,7 +289,7 @@ static IV PerlIOAPR_close(pTHX_ PerlIO *
const char *new_path = NULL;
apr_os_file_t os_file;
- if (!PL_dirty) {
+ if (PL_phase != PERL_PHASE_DESTRUCT) {
/* if this is called during perl_destruct we are in trouble */
apr_file_name_get(&new_path, st->file);
}
@@ -304,7 +304,7 @@ static IV PerlIOAPR_close(pTHX_ PerlIO *
new_path ? new_path : "(UNKNOWN)");
#endif
- if (PL_dirty) {
+ if (PL_phase == PERL_PHASE_DESTRUCT) {
/* there should not be any PerlIOAPR handles open
* during perl_destruct
*/
Modified: perl/modperl/trunk/xs/APR/Pool/APR__Pool.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Pool/APR__Pool.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Pool/APR__Pool.h (original)
+++ perl/modperl/trunk/xs/APR/Pool/APR__Pool.h Tue Jul 17 08:14:58 2012
@@ -60,7 +60,7 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_
MAGIC *mg = mg_find(acct->sv, PERL_MAGIC_ext); \
if (mg && mg->mg_obj) { \
sv_2mortal(mg->mg_obj); \
- mg->mg_obj = Nullsv; \
+ mg->mg_obj = (SV *)NULL; \
mg->mg_flags &= ~MGf_REFCOUNTED; \
} \
mg_free(acct->sv); \
@@ -87,7 +87,7 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_
acct->perl = aTHX; \
SvIVX(acct_sv) = PTR2IV(pool); \
\
- sv_magic(acct_sv, Nullsv, PERL_MAGIC_ext, \
+ sv_magic(acct_sv, (SV *)NULL, PERL_MAGIC_ext, \
MP_APR_POOL_NEW, sizeof(MP_APR_POOL_NEW)); \
\
apr_pool_cleanup_register(pool, (void *)acct, \
@@ -113,7 +113,7 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_
acct->sv = acct_sv; \
SvIVX(acct_sv) = PTR2IV(pool); \
\
- sv_magic(acct_sv, Nullsv, PERL_MAGIC_ext, \
+ sv_magic(acct_sv, (SV *)NULL, PERL_MAGIC_ext, \
MP_APR_POOL_NEW, sizeof(MP_APR_POOL_NEW)); \
\
apr_pool_cleanup_register(pool, (void *)acct, \
@@ -193,7 +193,7 @@ static MP_INLINE SV *mpxs_apr_pool_creat
#endif
{
- SV *rv = sv_setref_pv(NEWSV(0, 0), "APR::Pool", (void*)child_pool);
+ SV *rv = sv_setref_pv(newSV(0), "APR::Pool", (void*)child_pool);
SV *sv = SvRV(rv);
/* Each newly created pool must be destroyed only once. Calling
@@ -334,7 +334,7 @@ static MP_INLINE void mpxs_apr_pool_clea
(mpxs_cleanup_t *)apr_pcalloc(p, sizeof(*data));
data->cv = SvREFCNT_inc(cv);
- data->arg = arg ? SvREFCNT_inc(arg) : Nullsv;
+ data->arg = arg ? SvREFCNT_inc(arg) : (SV *)NULL;
data->p = p;
#ifdef USE_ITHREADS
data->perl = aTHX;
Modified: perl/modperl/trunk/xs/APR/Table/APR__Table.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Table/APR__Table.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Table/APR__Table.h (original)
+++ perl/modperl/trunk/xs/APR/Table/APR__Table.h Tue Jul 17 08:14:58 2012
@@ -21,7 +21,7 @@
#define MPXS_DO_TABLE_N_MAGIC_RETURN(call) \
apr_pool_t *p = mp_xs_sv2_APR__Pool(p_sv); \
apr_table_t *t = call; \
- SV *t_sv = modperl_hash_tie(aTHX_ "APR::Table", Nullsv, t); \
+ SV *t_sv = modperl_hash_tie(aTHX_ "APR::Table", (SV *)NULL, t); \
mpxs_add_pool_magic(t_sv, p_sv); \
return t_sv;
Modified: perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h (original)
+++ perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h Tue Jul 17 08:14:58 2012
@@ -24,7 +24,7 @@ SV *mpxs_apr_thread_mutex_create(pTHX_ S
apr_thread_mutex_t *mutex = NULL;
SV *mutex_sv;
(void)apr_thread_mutex_create(&mutex, flags, p);
- mutex_sv = sv_setref_pv(NEWSV(0, 0), "APR::ThreadMutex", (void*)mutex);
+ mutex_sv = sv_setref_pv(newSV(0), "APR::ThreadMutex", (void*)mutex);
mpxs_add_pool_magic(mutex_sv, p_sv);
return mutex_sv;
}
Modified: perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h (original)
+++ perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h Tue Jul 17 08:14:58 \
2012 @@ -23,7 +23,7 @@ SV *mpxs_apr_thread_rwlock_create(pTHX_
apr_thread_rwlock_t *rwlock = NULL;
SV *rwlock_sv;
(void)apr_thread_rwlock_create(&rwlock, p);
- rwlock_sv = sv_setref_pv(NEWSV(0, 0), "APR::ThreadRWLock", (void*)rwlock);
+ rwlock_sv = sv_setref_pv(newSV(0), "APR::ThreadRWLock", (void*)rwlock);
mpxs_add_pool_magic(rwlock_sv, p_sv);
return rwlock_sv;
}
Modified: perl/modperl/trunk/xs/APR/URI/APR__URI.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/URI/APR__URI.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/URI/APR__URI.h (original)
+++ perl/modperl/trunk/xs/APR/URI/APR__URI.h Tue Jul 17 08:14:58 2012
@@ -45,7 +45,7 @@ SV *mpxs_apr_uri_parse(pTHX_ SV *classna
(void)apr_uri_parse(p, uri_string, &uri->uri);
- uri_sv = sv_setref_pv(NEWSV(0, 0), "APR::URI", (void*)uri);
+ uri_sv = sv_setref_pv(newSV(0), "APR::URI", (void*)uri);
mpxs_add_pool_magic(uri_sv, p_sv);
return uri_sv;
@@ -91,5 +91,5 @@ SV *mpxs_APR__URI_rpath(pTHX_ apr_uri_t
return newSVpv(uri->uri.path, 0);
}
}
- return Nullsv;
+ return (SV *)NULL;
}
Modified: perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h (original)
+++ perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h Tue Jul 17 08:14:58 \
2012 @@ -109,7 +109,7 @@ static MP_INLINE SV *mpxs_Apache2__Direc
}
else {
hash_insert(aTHX_ hash, directive, directive_len,
- args, args_len, Nullsv);
+ args, args_len, (SV *)NULL);
}
tree = tree->next;
Modified: perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h (original)
+++ perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h Tue Jul 17 08:14:58 2012
@@ -107,10 +107,10 @@ static MP_INLINE U16 *modperl_filter_att
char *str; \
len -= 2; /* s/ \( | \) //x */ \
string++; /* skip the opening '(' */ \
- New(0, str, len+1, char); \
+ Newx(str, len+1, char); \
Copy(string, str, len+1, char); \
str[len] = '\0'; /* remove the closing ')' */ \
- sv_magic(cv, Nullsv, '~', NULL, -1); \
+ sv_magic(cv, (SV *)NULL, '~', NULL, -1); \
SvMAGIC(cv)->mg_ptr = str; \
}
@@ -186,7 +186,7 @@ static MP_INLINE SV *mpxs_Apache2__Filte
* (and it can contain any references)
*/
- if (data != Nullsv) {
+ if (data != (SV *)NULL) {
if (ctx->data) {
if (SvOK(ctx->data) && SvREFCNT(ctx->data)) {
/* release the previously stored SV so we don't leak
Modified: perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h (original)
+++ perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h Tue Jul 17 08:14:58 2012
@@ -31,7 +31,7 @@ static void mpxs_ap_log_error(pTHX_ int
char *file = NULL;
int line = 0;
char *str;
- SV *svstr = Nullsv;
+ SV *svstr = (SV *)NULL;
STRLEN n_a;
int lmask = level & APLOG_LEVELMASK;
server_rec *s;
@@ -217,7 +217,7 @@ MP_STATIC XS(MPXS_Apache2__Log_LOG_MARK)
MP_STATIC XS(MPXS_Apache2__Log_log_xerror)
{
dXSARGS;
- SV *msgsv = Nullsv;
+ SV *msgsv = (SV *)NULL;
STRLEN n_a;
request_rec *r = NULL;
server_rec *s = NULL;
@@ -284,7 +284,7 @@ MP_STATIC XS(MPXS_Apache2__Log_log_error
server_rec *s = NULL;
int i = 0;
char *errstr = NULL;
- SV *sv = Nullsv;
+ SV *sv = (SV *)NULL;
STRLEN n_a;
if (items > 1) {
Modified: perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h (original)
+++ perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h Tue Jul 17 08:14:58 \
2012 @@ -312,7 +312,7 @@ int mpxs_Apache2__RequestRec_OPEN(pTHX_
}
name = SvPV(arg, len);
- return do_open(handle, name, len, FALSE, O_RDONLY, 0, Nullfp);
+ return do_open(handle, name, len, FALSE, O_RDONLY, 0, (PerlIO *)NULL);
}
static MP_INLINE
Modified: perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h (original)
+++ perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h Tue Jul 17 \
08:14:58 2012 @@ -120,7 +120,7 @@ SV *mpxs_Apache2__RequestRec_new(pTHX_ S
r->assbackwards = 1;
r->protocol = "UNKNOWN";
- r_sv = sv_setref_pv(NEWSV(0, 0), "Apache2::RequestRec", (void*)r);
+ r_sv = sv_setref_pv(newSV(0), "Apache2::RequestRec", (void*)r);
if (base_pool_sv) {
mpxs_add_pool_magic(r_sv, base_pool_sv);
Modified: perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h (original)
+++ perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h Tue Jul 17 \
08:14:58 2012 @@ -108,7 +108,7 @@ void mpxs_Apache2__ServerUtil_server_shu
* before parent perl is destroyed */
data = (mpxs_cleanup2_t *)apr_pcalloc(p, sizeof(*data));
data->cv = SvREFCNT_inc(cv);
- data->arg = arg ? SvREFCNT_inc(arg) : Nullsv;
+ data->arg = arg ? SvREFCNT_inc(arg) : (SV *)NULL;
data->p = p;
#ifdef USE_ITHREADS
data->perl = aTHX;
Modified: perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h (original)
+++ perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h Tue Jul 17 \
08:14:58 2012 @@ -144,7 +144,7 @@ MP_STATIC XS(MPXS_modperl_spawn_proc_pro
apr_status_t rc;
const char **argv;
int i=0;
- AV *av_argv = Nullav;
+ AV *av_argv = (AV *)NULL;
I32 len=-1, av_items=0;
request_rec *r = modperl_xs_sv2request_rec(aTHX_ ST(0), NULL, cv);
const char *command = (const char *)SvPV_nolen(ST(1));
Modified: perl/modperl/trunk/xs/maps/apr_functions.map
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/maps/apr_functions.map?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/apr_functions.map (original)
+++ perl/modperl/trunk/xs/maps/apr_functions.map Tue Jul 17 08:14:58 2012
@@ -50,7 +50,7 @@ MODULE=APR::Socket
~apr_socket_recv
mpxs_APR__Socket_recv
apr_socket_recvfrom
- apr_socket_send | mpxs_ | sock, SV *:buf, SV *:len=Nullsv
+ apr_socket_send | mpxs_ | sock, SV *:buf, SV *:len=(SV *)NULL
apr_socket_sendto
!apr_socket_shutdown
-apr_socket_inherit_set
@@ -187,7 +187,7 @@ mpxs_APR__Pool_clear
!apr_pool_cleanup_kill
!apr_pool_cleanup_run
-apr_pool_cleanup_null
- apr_pool_cleanup_register | mpxs_ | p, SV *:cv, SV *:arg=Nullsv
+ apr_pool_cleanup_register | mpxs_ | p, SV *:cv, SV *:arg=(SV *)NULL
!apr_pool_note_subprocess
-apr_palloc
>apr_palloc_debug
@@ -271,7 +271,7 @@ MODULE=APR::Table
void:DEFINE_STORE | | apr_table_t *:t, const char *:key, const char *:value
void:DEFINE_DELETE | | apr_table_t *:t, const char *:key
void:DEFINE_CLEAR | | apr_table_t *:t
- const char *:DEFINE_FIRSTKEY | mpxs_APR__Table_NEXTKEY | SV *:tsv, SV *:key=Nullsv
+ const char *:DEFINE_FIRSTKEY | mpxs_APR__Table_NEXTKEY | SV *:tsv, SV *:key=(SV \
*)NULL mpxs_APR__Table_NEXTKEY | | SV *:tsv, SV *:key=&PL_sv_undef
mpxs_APR__Table_FETCH
mpxs_APR__Table_EXISTS
@@ -593,7 +593,7 @@ MODULE=APR::URI
apr_uri_unparse | mpxs_ | \
uptr, flags=APR_URI_UNP_OMITPASSWORD | unparse
#special case to set both uri->port and uri->port_str
- mpxs_APR__URI_port | | uri, portsv=Nullsv
+ mpxs_APR__URI_port | | uri, portsv=(SV *)NULL
mpxs_APR__URI_rpath
apr_uri_port_of_scheme
Modified: perl/modperl/trunk/xs/maps/modperl_functions.map
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/maps/modperl_functions.map?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/modperl_functions.map (original)
+++ perl/modperl/trunk/xs/maps/modperl_functions.map Tue Jul 17 08:14:58 2012
@@ -15,12 +15,12 @@ MODULE=ModPerl::Global
mpxs_ModPerl__Global_special_list_register
MODULE=Apache2::RequestRec PACKAGE=Apache2::RequestRec
- mpxs_Apache2__RequestRec_content_type | | r, type=Nullsv
- mpxs_Apache2__RequestRec_proxyreq | | r, val=Nullsv
- mpxs_Apache2__RequestRec_subprocess_env | | r, key=NULL, val=Nullsv
+ mpxs_Apache2__RequestRec_content_type | | r, type=(SV *)NULL
+ mpxs_Apache2__RequestRec_proxyreq | | r, val=(SV *)NULL
+ mpxs_Apache2__RequestRec_subprocess_env | | r, key=NULL, val=(SV *)NULL
mpxs_Apache2__RequestRec_finfo | | r, finfo=NULL
mpxs_Apache2__RequestRec_handler | | ...
- mpxs_Apache2__RequestRec_content_languages | | r, languages=Nullsv
+ mpxs_Apache2__RequestRec_content_languages | | r, languages=(SV *)NULL
MODULE=Apache2::RequestUtil PACKAGE=guess
mpxs_Apache2__RequestRec_push_handlers
@@ -29,26 +29,26 @@ MODULE=Apache2::RequestUtil PACKAGE=gu
mpxs_Apache2__RequestRec_is_perl_option_enabled
mpxs_Apache2__RequestRec_location
mpxs_Apache2__RequestRec_as_string
- mpxs_Apache2__RequestRec_pnotes | | r, key=Nullsv, val=Nullsv
+ mpxs_Apache2__RequestRec_pnotes | | r, key=(SV *)NULL, val=(SV *)NULL
mpxs_Apache2__RequestRec_add_config | | r, lines, \
override=MP_HTTPD_OVERRIDE_HTACCESS, path=NULL, \
override_options=MP_HTTPD_OVERRIDE_OPTS_UNSET
- mpxs_Apache2__RequestRec_document_root | | r, new_root=Nullsv
+ mpxs_Apache2__RequestRec_document_root | | r, new_root=(SV *)NULL
mpxs_Apache2__RequestRec_child_terminate
#protocol module helpers
mpxs_Apache2__RequestRec_location_merge
mpxs_Apache2__RequestRec_set_basic_credentials
- mpxs_Apache2__RequestRec_no_cache | | r, flag=Nullsv
+ mpxs_Apache2__RequestRec_no_cache | | r, flag=(SV *)NULL
PACKAGE=Apache2::RequestRec
- mpxs_Apache2__RequestRec_new | | classname, c, base_pool_sv=Nullsv
- SV *:DEFINE_dir_config | | request_rec *:r, char *:key=NULL, SV *:sv_val=Nullsv
+ mpxs_Apache2__RequestRec_new | | classname, c, base_pool_sv=(SV *)NULL
+ SV *:DEFINE_dir_config | | request_rec *:r, char *:key=NULL, SV *:sv_val=(SV *)NULL
SV *:DEFINE_slurp_filename | | request_rec *:r, int:tainted=1
MODULE=Apache2::RequestUtil PACKAGE=Apache2::RequestUtil
- mpxs_Apache2__RequestUtil_request | | classname, svr=Nullsv
+ mpxs_Apache2__RequestUtil_request | | classname, svr=(SV *)NULL
MODULE=Apache2::RequestIO PACKAGE=Apache2::RequestRec
- SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=Nullsv
+ SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=(SV *)NULL
SV *:DEFINE_PRINT | | ...
apr_size_t:DEFINE_PRINTF | | ...
SV *:DEFINE_BINMODE | | request_rec *:r
@@ -63,7 +63,7 @@ MODULE=Apache2::RequestIO PACKAGE=Apac
request_rec *:r, SV *:buffer, apr_size_t:len=-1, apr_off_t:offset=0
mpxs_Apache2__RequestRec_rflush | | ...
mpxs_Apache2__RequestRec_GETC
- mpxs_Apache2__RequestRec_OPEN | | SV *:self, SV *:arg1, SV *:arg2=Nullsv
+ mpxs_Apache2__RequestRec_OPEN | | SV *:self, SV *:arg1, SV *:arg2=(SV *)NULL
mpxs_Apache2__RequestRec_FILENO
MODULE=Apache2::Response PACKAGE=Apache2::RequestRec
@@ -79,22 +79,22 @@ MODULE=Apache2::ServerUtil PACKAGE=gue
mpxs_Apache2__ServerRec_add_config
MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerRec
- SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=Nullsv
+ SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=(SV *)NULL
MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerUtil
- mpxs_Apache2__ServerUtil_server_shutdown_cleanup_register | | cv, arg=Nullsv
+ mpxs_Apache2__ServerUtil_server_shutdown_cleanup_register | | cv, arg=(SV *)NULL
int:DEFINE_restart_count
MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerUtil
- server_rec *:DEFINE_server | | SV *:classname=Nullsv
- uid_t:DEFINE_user_id | | SV *:classname=Nullsv
- gid_t:DEFINE_group_id | | SV *:classname=Nullsv
+ server_rec *:DEFINE_server | | SV *:classname=(SV *)NULL
+ uid_t:DEFINE_user_id | | SV *:classname=(SV *)NULL
+ gid_t:DEFINE_group_id | | SV *:classname=(SV *)NULL
MODULE=Apache2::Connection
mpxs_Apache2__Connection_client_socket | | c, s=NULL
MODULE=Apache2::ConnectionUtil PACKAGE=guess
- mpxs_Apache2__Connection_pnotes | | c, key=Nullsv, val=Nullsv
+ mpxs_Apache2__Connection_pnotes | | c, key=(SV *)NULL, val=(SV *)NULL
MODULE=Apache2::Filter
modperl_filter_attributes | MPXS_ | ... | MODIFY_CODE_ATTRIBUTES
@@ -102,10 +102,10 @@ MODULE=Apache2::Filter
mpxs_Apache2__Filter_print | | ...
mpxs_Apache2__Filter_read | | ...
mpxs_Apache2__Filter_seen_eos | | ...
- mpxs_Apache2__Filter_ctx | | filter, data=Nullsv
+ mpxs_Apache2__Filter_ctx | | filter, data=(SV *)NULL
mpxs_Apache2__Filter_remove | | ...
- SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=Nullsv
+ SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=(SV *)NULL
apr_size_t:DEFINE_PRINT | | ...
MODULE=Apache2::Filter PACKAGE=Apache2::RequestRec
Modified: perl/modperl/trunk/xs/modperl_xs_util.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/modperl_xs_util.h?rev=1362399&r1=1362398&r2=1362399&view=diff
==============================================================================
--- perl/modperl/trunk/xs/modperl_xs_util.h (original)
+++ perl/modperl/trunk/xs/modperl_xs_util.h Tue Jul 17 08:14:58 2012
@@ -121,17 +121,17 @@
* the object is generated by modperl_hash_tie, so under 5.8+
* need to use sv_magicext, since sv_magicext does only one magic
* of the same type at 5.8+ */
-#define mpxs_add_pool_magic_doit(obj, pool_obj) \
- sv_magicext(SvRV(obj), pool_obj, PERL_MAGIC_ext, NULL, Nullch, -1)
+#define mpxs_add_pool_magic_doit(obj, pool_obj) \
+ sv_magicext(SvRV(obj), pool_obj, PERL_MAGIC_ext, NULL, (char *)NULL, -1)
#else
-#define mpxs_add_pool_magic_doit(obj, pool_obj) \
- sv_magic(SvRV(obj), pool_obj, PERL_MAGIC_ext, Nullch, -1)
+#define mpxs_add_pool_magic_doit(obj, pool_obj) \
+ sv_magic(SvRV(obj), pool_obj, PERL_MAGIC_ext, (char *)NULL, -1)
#endif
/* add dependency magic only for custom pools. there are all kind of
* complications when more than one magic of the same type(in this
* case PERL_MAGIC_ext is added), luckily most of the PERL_MAGIC_ext
- * magic used by modperl-core, uses Nullsv as mg->mg_obj, therefore
+ * magic used by modperl-core, uses (SV *)NULL as mg->mg_obj, therefore
* the following code tries to workaround the multiple magic issue, by
* simply hanging the pool object into the unused slot, incrementing
* its refcnt just like sv_magic does internally. In case we ever hit
@@ -142,7 +142,7 @@
if (mpxs_pool_is_custom(SvRV(pool_obj))) { \
MAGIC *mg = mg_find(SvRV(obj), PERL_MAGIC_ext); \
if (mg) { \
- if (mg->mg_obj == Nullsv) { \
+ if (mg->mg_obj == (SV *)NULL) { \
mg->mg_obj = SvREFCNT_inc(SvRV(pool_obj)); \
mg->mg_flags |= MGf_REFCOUNTED; \
} \
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic