dougm 01/11/06 19:39:09
Modified: xs/APR/Bucket APR__Bucket.h
xs/APR/Table APR__Table.h
xs/APR/URI APR__URI.h
xs/Apache/Module Apache__Module.h
xs/Apache/RequestIO Apache__RequestIO.h
xs/Apache/RequestUtil Apache__RequestUtil.h
xs/Apache/ServerUtil Apache__ServerUtil.h
xs/ModPerl/Global ModPerl__Global.h
xs/tables/current/ModPerl FunctionTable.pm
Log:
rid dTHX; usage
Revision Changes Path
1.3 +1 -3 modperl-2.0/xs/APR/Bucket/APR__Bucket.h
Index: APR__Bucket.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/Bucket/APR__Bucket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- APR__Bucket.h 2001/04/19 17:38:12 1.2
+++ APR__Bucket.h 2001/11/07 03:39:08 1.3
@@ -1,10 +1,8 @@
#include "modperl_bucket.h"
-static apr_bucket *mpxs_APR__Bucket_new(SV *classname, SV *sv,
+static apr_bucket *mpxs_APR__Bucket_new(pTHX_ SV *classname, SV *sv,
int offset, int len)
{
- dTHX; /*XXX*/
-
if (!len) {
(void)SvPV(sv, len);
}
1.6 +3 -4 modperl-2.0/xs/APR/Table/APR__Table.h
Index: APR__Table.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/Table/APR__Table.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- APR__Table.h 2001/09/28 17:20:32 1.5
+++ APR__Table.h 2001/11/07 03:39:08 1.6
@@ -104,9 +104,8 @@
((apr_table_entry_t *) \
apr_table_elts(t)->elts)[mpxs_apr_table_iterix(sv)++].key
-static MP_INLINE const char *mpxs_APR__Table_NEXTKEY(SV *tsv, SV *key)
+static MP_INLINE const char *mpxs_APR__Table_NEXTKEY(pTHX_ SV *tsv, SV *key)
{
- dTHX;
apr_table_t *t = mp_xs_sv2_APR__Table(tsv);
if (apr_is_empty_table(t)) {
@@ -120,11 +119,11 @@
return NULL;
}
-static MP_INLINE const char *mpxs_APR__Table_FIRSTKEY(SV *tsv)
+static MP_INLINE const char *mpxs_APR__Table_FIRSTKEY(pTHX_ SV *tsv)
{
mpxs_apr_table_iterix(tsv) = 0; /* reset iterator index */
- return mpxs_APR__Table_NEXTKEY(tsv, Nullsv);
+ return mpxs_APR__Table_NEXTKEY(aTHX_ tsv, Nullsv);
}
static XS(MPXS_apr_table_get)
1.3 +1 -2 modperl-2.0/xs/APR/URI/APR__URI.h
Index: APR__URI.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/URI/APR__URI.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- APR__URI.h 2001/08/19 17:33:32 1.2
+++ APR__URI.h 2001/11/07 03:39:08 1.3
@@ -36,9 +36,8 @@
}
static MP_INLINE
-char *mpxs_APR__URI_port(apr_uri_t *uri, SV *portsv)
+char *mpxs_APR__URI_port(pTHX_ apr_uri_t *uri, SV *portsv)
{
- dTHX; /*XXX*/
char *port_str = uri->port_str;
if (portsv) {
1.4 +1 -2 modperl-2.0/xs/Apache/Module/Apache__Module.h
Index: Apache__Module.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Module/Apache__Module.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__Module.h 2001/10/06 01:03:27 1.3
+++ Apache__Module.h 2001/11/07 03:39:08 1.4
@@ -1,7 +1,7 @@
#define mpxs_Apache__Module_top_module(CLASS) \
(CLASS ? ap_top_module : ap_top_module)
-static MP_INLINE int mpxs_Apache__Module_loaded(char *name)
+static MP_INLINE int mpxs_Apache__Module_loaded(pTHX_ char *name)
{
char nameptr[256];
char *base;
@@ -34,7 +34,6 @@
return 0;
}
else {
- dTHX; /*XXX*/
return modperl_perl_module_loaded(aTHX_ name);
}
}
1.21 +6 -6 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Apache__RequestIO.h 2001/11/07 03:12:50 1.20
+++ Apache__RequestIO.h 2001/11/07 03:39:08 1.21
@@ -88,14 +88,14 @@
}
/* alias */
-#define mpxs_Apache__RequestRec_WRITE mpxs_Apache__RequestRec_write
+#define mpxs_Apache__RequestRec_WRITE(r, buffer, bufsiz, offset) \
+ mpxs_Apache__RequestRec_write(aTHX_ r, buffer, bufsiz, offset)
static MP_INLINE
-apr_ssize_t mpxs_Apache__RequestRec_write(request_rec *r,
+apr_ssize_t mpxs_Apache__RequestRec_write(pTHX_ request_rec *r,
SV *buffer, apr_ssize_t bufsiz,
int offset)
{
- dTHX; /*XXX*/
apr_ssize_t wlen = bufsiz;
const char *buf;
STRLEN svlen;
@@ -157,13 +157,13 @@
(r->read_length || ap_should_client_block(r))
/* alias */
-#define mpxs_Apache__RequestRec_READ mpxs_Apache__RequestRec_read
+#define mpxs_Apache__RequestRec_READ(r, buffer, bufsiz, offset) \
+ mpxs_Apache__RequestRec_read(aTHX_ r, buffer, bufsiz, offset)
-static long mpxs_Apache__RequestRec_read(request_rec *r,
+static long mpxs_Apache__RequestRec_read(pTHX_ request_rec *r,
SV *buffer, int bufsiz,
int offset)
{
- dTHX; /*XXX*/
long nrd = 0;
int rc;
1.10 +5 -10 modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h
Index: Apache__RequestUtil.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Apache__RequestUtil.h 2001/11/01 22:18:25 1.9
+++ Apache__RequestUtil.h 2001/11/07 03:39:08 1.10
@@ -1,9 +1,8 @@
static MP_INLINE
-int mpxs_Apache__RequestRec_push_handlers(request_rec *r,
+int mpxs_Apache__RequestRec_push_handlers(pTHX_ request_rec *r,
const char *name,
SV *sv)
{
- dTHX; /*XXX*/
return modperl_handler_perl_add_handlers(aTHX_
r, NULL, r->server, r->pool,
name, sv,
@@ -12,11 +11,10 @@
}
static MP_INLINE
-int mpxs_Apache__RequestRec_set_handlers(request_rec *r,
+int mpxs_Apache__RequestRec_set_handlers(pTHX_ request_rec *r,
const char *name,
SV *sv)
{
- dTHX; /*XXX*/
return modperl_handler_perl_add_handlers(aTHX_
r, NULL, r->server, r->pool,
name, sv,
@@ -24,10 +22,9 @@
}
static MP_INLINE
-SV *mpxs_Apache__RequestRec_get_handlers(request_rec *r,
+SV *mpxs_Apache__RequestRec_get_handlers(pTHX_ request_rec *r,
const char *name)
{
- dTHX; /*XXX*/
MpAV **handp =
modperl_handler_get_handlers(r, NULL, r->server,
r->pool, name,
@@ -86,7 +83,7 @@
}
static MP_INLINE
-request_rec *mpxs_Apache_request(SV *classname, SV *svr)
+request_rec *mpxs_Apache_request(pTHX_ SV *classname, SV *svr)
{
request_rec *cur;
apr_status_t status = modperl_tls_get_request_rec(&cur);
@@ -96,7 +93,6 @@
}
if (svr) {
- dTHX; /*XXX*/
modperl_global_request_obj_set(aTHX_ svr);
}
@@ -156,9 +152,8 @@
static MP_INLINE
-int mpxs_Apache__RequestRec_no_cache(request_rec *r, SV *flag)
+int mpxs_Apache__RequestRec_no_cache(pTHX_ request_rec *r, SV *flag)
{
- dTHX; /* XXX */
int retval = r->no_cache;
if (flag) {
1.4 +3 -6 modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h
Index: Apache__ServerUtil.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__ServerUtil.h 2001/10/09 18:01:21 1.3
+++ Apache__ServerUtil.h 2001/11/07 03:39:08 1.4
@@ -1,9 +1,8 @@
static MP_INLINE
-int mpxs_Apache__Server_push_handlers(server_rec *s,
+int mpxs_Apache__Server_push_handlers(pTHX_ server_rec *s,
const char *name,
SV *sv)
{
- dTHX; /*XXX*/
return modperl_handler_perl_add_handlers(aTHX_
NULL, NULL, s,
s->process->pconf,
@@ -13,11 +12,10 @@
}
static MP_INLINE
-int mpxs_Apache__Server_set_handlers(server_rec *s,
+int mpxs_Apache__Server_set_handlers(pTHX_ server_rec *s,
const char *name,
SV *sv)
{
- dTHX; /*XXX*/
return modperl_handler_perl_add_handlers(aTHX_
NULL, NULL, s,
s->process->pconf,
@@ -26,10 +24,9 @@
}
static MP_INLINE
-SV *mpxs_Apache__Server_get_handlers(server_rec *s,
+SV *mpxs_Apache__Server_get_handlers(pTHX_ server_rec *s,
const char *name)
{
- dTHX; /*XXX*/
MpAV **handp =
modperl_handler_get_handlers(NULL, NULL, s,
s->process->pconf, name,
1.3 +2 -4 modperl-2.0/xs/ModPerl/Global/ModPerl__Global.h
Index: ModPerl__Global.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/ModPerl/Global/ModPerl__Global.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ModPerl__Global.h 2001/10/08 16:57:08 1.2
+++ ModPerl__Global.h 2001/11/07 03:39:08 1.3
@@ -21,19 +21,17 @@
}
static
-MP_INLINE int mpxs_ModPerl__Global_special_list_call(const char *name,
+MP_INLINE int mpxs_ModPerl__Global_special_list_call(pTHX_ const char *name,
SV *package)
{
- dTHX; /* XXX */
return mpxs_special_list_do(aTHX_ name, package,
modperl_perl_global_avcv_call);
}
static
-MP_INLINE int mpxs_ModPerl__Global_special_list_clear(const char *name,
+MP_INLINE int mpxs_ModPerl__Global_special_list_clear(pTHX_ const char *name,
SV *package)
{
- dTHX; /* XXX */
return mpxs_special_list_do(aTHX_ name, package,
modperl_perl_global_avcv_clear);
}
1.45 +65 -1 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- FunctionTable.pm 2001/11/07 03:13:21 1.44
+++ FunctionTable.pm 2001/11/07 03:39:09 1.45
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Tue Nov 6 19:24:25 2001
+# ! Tue Nov 6 19:34:31 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -3893,6 +3893,10 @@
],
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'SV *',
'name' => 'classname'
},
@@ -3965,6 +3969,10 @@
],
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'SV *',
'name' => 'tsv'
},
@@ -3979,6 +3987,10 @@
'name' => 'mpxs_APR__URI_port',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'apr_uri_t *',
'name' => 'uri'
},
@@ -4083,6 +4095,10 @@
],
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'char *',
'name' => 'name'
}
@@ -4093,6 +4109,10 @@
'name' => 'mpxs_Apache__RequestRec_get_handlers',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -4149,6 +4169,10 @@
'name' => 'mpxs_Apache__RequestRec_no_cache',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -4195,6 +4219,10 @@
'name' => 'mpxs_Apache__RequestRec_push_handlers',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -4216,6 +4244,10 @@
],
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -4292,6 +4324,10 @@
'name' => 'mpxs_Apache__RequestRec_set_handlers',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -4310,6 +4346,10 @@
'name' => 'mpxs_Apache__RequestRec_write',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -4332,6 +4372,10 @@
'name' => 'mpxs_Apache__Server_get_handlers',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'server_rec *',
'name' => 's'
},
@@ -4346,6 +4390,10 @@
'name' => 'mpxs_Apache__Server_push_handlers',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'server_rec *',
'name' => 's'
},
@@ -4364,6 +4412,10 @@
'name' => 'mpxs_Apache__Server_set_handlers',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'server_rec *',
'name' => 's'
},
@@ -4382,6 +4434,10 @@
'name' => 'mpxs_Apache_request',
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'SV *',
'name' => 'classname'
},
@@ -4399,6 +4455,10 @@
],
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'const char *',
'name' => 'name'
},
@@ -4415,6 +4475,10 @@
'__inline__'
],
'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
{
'type' => 'const char *',
'name' => 'name'
