dougm 01/09/23 20:32:55 Modified: src/modules/perl modperl_bucket.c Log: adjust to bucket api changes (no more sms) Submitted by: Ryan Bloom <[EMAIL PROTECTED]> Reviewed by: dougm Revision Changes Path 1.7 +5 -15 modperl-2.0/src/modules/perl/modperl_bucket.c Index: modperl_bucket.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_bucket.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- modperl_bucket.c 2001/08/27 17:14:48 1.6 +++ modperl_bucket.c 2001/09/24 03:32:55 1.7 @@ -9,7 +9,6 @@ apr_bucket_refcount refcount; SV *sv; PerlInterpreter *perl; - apr_sms_t *sms; } modperl_bucket_sv_t; static apr_status_t @@ -45,7 +44,7 @@ SvREFCNT_dec(svbucket->sv); - apr_sms_free(svbucket->sms, svbucket); + free(svbucket); } static const apr_bucket_type_t modperl_bucket_sv_type = { @@ -64,11 +63,8 @@ { modperl_bucket_sv_t *svbucket; - svbucket = (modperl_bucket_sv_t *)apr_sms_malloc(bucket->sms, - sizeof(*svbucket)); + svbucket = (modperl_bucket_sv_t *)malloc(sizeof(*svbucket)); - svbucket->sms = bucket->sms; - bucket = apr_bucket_shared_make(bucket, svbucket, offset, offset+len); /* XXX: need to deal with PerlInterpScope */ @@ -78,7 +74,7 @@ svbucket->sv = sv; if (!bucket) { - apr_sms_free(svbucket->sms, svbucket); + free(svbucket); return NULL; } @@ -88,23 +84,17 @@ (unsigned long)sv, SvREFCNT(sv)); bucket->type = &modperl_bucket_sv_type; + bucket->free = free; return bucket; } apr_bucket *modperl_bucket_sv_create(pTHX_ SV *sv, int offset, int len) { - apr_sms_t *sms; apr_bucket *bucket; - - if (!apr_bucket_global_sms) { - apr_sms_std_create(&apr_bucket_global_sms); - } - sms = apr_bucket_global_sms; - bucket = (apr_bucket *)apr_sms_malloc(sms, sizeof(*bucket)); + bucket = (apr_bucket *)malloc(sizeof(*bucket)); APR_BUCKET_INIT(bucket); - bucket->sms = sms; return modperl_bucket_sv_make(aTHX_ bucket, sv, offset, len); }