stas 2004/07/12 01:17:09
Modified: xs/Apache/RequestIO Apache__RequestIO.h
xs/maps modperl_functions.map
Log:
s/bufsv/buffer/ to be consistent with other _read() implementations
Revision Changes Path
1.54 +11 -11 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.53
retrieving revision 1.54
diff -u -u -r1.53 -r1.54
--- Apache__RequestIO.h 12 Jul 2004 07:32:07 -0000 1.53
+++ Apache__RequestIO.h 12 Jul 2004 08:17:09 -0000 1.54
@@ -226,17 +226,17 @@
(r->read_length || ap_should_client_block(r))
/* alias */
-#define mpxs_Apache__RequestRec_READ(r, bufsv, len, offset) \
- mpxs_Apache__RequestRec_read(aTHX_ r, bufsv, len, offset)
+#define mpxs_Apache__RequestRec_READ(r, buffer, len, offset) \
+ mpxs_Apache__RequestRec_read(aTHX_ r, buffer, len, offset)
static SV *mpxs_Apache__RequestRec_read(pTHX_ request_rec *r,
- SV *bufsv, apr_size_t len,
+ SV *buffer, apr_size_t len,
apr_off_t offset)
{
SSize_t total;
- if (!SvOK(bufsv)) {
- sv_setpvn(bufsv, "", 0);
+ if (!SvOK(buffer)) {
+ sv_setpvn(buffer, "", 0);
}
if (len <= 0) {
@@ -246,19 +246,19 @@
/* XXX: need to handle negative offset */
/* XXX: need to pad with \0 if offset > size of the buffer */
- mpxs_sv_grow(bufsv, len+offset);
- total = modperl_request_read(aTHX_ r, SvPVX(bufsv)+offset, len);
+ mpxs_sv_grow(buffer, len+offset);
+ total = modperl_request_read(aTHX_ r, SvPVX(buffer)+offset, len);
if (total > 0) {
- mpxs_sv_cur_set(bufsv, offset+total);
- SvTAINTED_on(bufsv);
+ mpxs_sv_cur_set(buffer, offset+total);
+ SvTAINTED_on(buffer);
}
else {
- sv_setpvn(bufsv, "", 0);
+ sv_setpvn(buffer, "", 0);
}
/* must run any set magic */
- SvSETMAGIC(bufsv);
+ SvSETMAGIC(buffer);
return newSViv(total);
}
1.78 +2 -2 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -u -r1.77 -r1.78
--- modperl_functions.map 9 Jul 2004 08:01:22 -0000 1.77
+++ modperl_functions.map 12 Jul 2004 08:17:09 -0000 1.78
@@ -54,8 +54,8 @@
SV *:DEFINE_CLOSE | | request_rec *:r
SV *:DEFINE_UNTIE | | request_rec *:r, int:refcnt
mpxs_Apache__RequestRec_sendfile | | r, filename=r->filename, offset=0, len=0
- mpxs_Apache__RequestRec_read | | r, bufsv, len, offset=0
- SV *:DEFINE_READ | | request_rec *:r, SV *:bufsv, apr_size_t:len,
apr_off_t:offset=0
+ mpxs_Apache__RequestRec_read | | r, buffer, len, offset=0
+ SV *:DEFINE_READ | | request_rec *:r, SV *:buffer, apr_size_t:len,
apr_off_t:offset=0
mpxs_Apache__RequestRec_write | | r, buffer, len=-1, offset=0
mpxs_Apache__RequestRec_print | | ...
apr_size_t:DEFINE_WRITE | | \
