Author: stas Date: Fri Dec 24 15:35:30 2004 New Revision: 123305 URL: http://svn.apache.org/viewcvs?view=rev&rev=123305 Log: the autogenerated server_root_relative does the copy of the string anyway, so no point in having a manually coded wrapper
Modified: perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h perl/modperl/trunk/xs/maps/apache_functions.map perl/modperl/trunk/xs/maps/modperl_functions.map perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Modified: perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h?view=diff&rev=123305&p1=perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h&r1=123304&p2=perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h&r2=123305 ============================================================================== --- perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h (original) +++ perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h Fri Dec 24 15:35:30 2004 @@ -152,15 +152,6 @@ #define mpxs_Apache_server(classname) modperl_global_get_server_rec() static MP_INLINE -SV *mpxs_Apache__ServerUtil_server_root_relative(pTHX_ apr_pool_t *p, - const char *fname) -{ - /* copy the SV in case the pool goes out of scope before the perl - * scalar */ - return newSVpv(ap_server_root_relative(p, fname), 0); -} - -static MP_INLINE int mpxs_Apache__ServerRec_is_perl_option_enabled(pTHX_ server_rec *s, const char *name) { Modified: perl/modperl/trunk/xs/maps/apache_functions.map Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/maps/apache_functions.map?view=diff&rev=123305&p1=perl/modperl/trunk/xs/maps/apache_functions.map&r1=123304&p2=perl/modperl/trunk/xs/maps/apache_functions.map&r2=123305 ============================================================================== --- perl/modperl/trunk/xs/maps/apache_functions.map (original) +++ perl/modperl/trunk/xs/maps/apache_functions.map Fri Dec 24 15:35:30 2004 @@ -164,6 +164,7 @@ MODULE=Apache::ServerUtil PACKAGE=Apache::ServerUtil ap_exists_config_define + ap_server_root_relative | | p, fname="" MODULE=Apache::ServerUtil PACKAGE=guess ap_error_log2stderr @@ -176,7 +177,6 @@ ~ap_get_server_built ~ap_get_server_version ~ap_server_root -~ap_server_root_relative MODULE=Apache::Connection PACKAGE=guess Modified: perl/modperl/trunk/xs/maps/modperl_functions.map Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/maps/modperl_functions.map?view=diff&rev=123305&p1=perl/modperl/trunk/xs/maps/modperl_functions.map&r1=123304&p2=perl/modperl/trunk/xs/maps/modperl_functions.map&r2=123305 ============================================================================== --- perl/modperl/trunk/xs/maps/modperl_functions.map (original) +++ perl/modperl/trunk/xs/maps/modperl_functions.map Fri Dec 24 15:35:30 2004 @@ -81,7 +81,6 @@ SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=Nullsv MODULE=Apache::ServerUtil PACKAGE=Apache::ServerUtil - mpxs_Apache__ServerUtil_server_root_relative | | p, fname="" mpxs_Apache__ServerUtil_server_shutdown_cleanup_register | | cv, arg=Nullsv int:DEFINE_restart_count Modified: perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm?view=diff&rev=123305&p1=perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm&r1=123304&p2=perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm&r2=123305 ============================================================================== --- perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm (original) +++ perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Fri Dec 24 15:35:30 2004 @@ -2,7 +2,7 @@ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # ! WARNING: generated by ModPerl::ParseSource/0.01 -# ! Fri Dec 24 16:06:42 2004 +# ! Fri Dec 24 18:22:05 2004 # ! do NOT edit, any changes will be lost ! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -7252,24 +7252,6 @@ { 'type' => 'PerlInterpreter *', 'name' => 'my_perl' - } - ] - }, - { - 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__ServerUtil_server_root_relative', - 'args' => [ - { - 'type' => 'PerlInterpreter *', - 'name' => 'my_perl' - }, - { - 'type' => 'apr_pool_t *', - 'name' => 'p' - }, - { - 'type' => 'const char *', - 'name' => 'fname' } ] },