diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-03-17 20:00:12 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-03-17 20:00:12 +0000 |
| commit | 284ee456826016ea93485015648c2b3b4b3bcd40 (patch) | |
| tree | 4f82b5a7625bf9b0b8b809bcf179b0bae430489f /ext | |
| parent | 54f0641bc82f8965b371b5750b4424f8aef9918d (diff) | |
| download | perl-284ee456826016ea93485015648c2b3b4b3bcd40.tar.gz | |
Other :encoding oddities
- we should really pop while we can still make method calls
in case DESTROY does something.
- Provide a no-op DESTROY
- Use SvPV_only() rather than just SvPV_on()
p4raw-id: //depot/perlio@15274
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Encode/Encode.xs | 15 | ||||
| -rw-r--r-- | ext/Encode/lib/Encode/Encoding.pm | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ext/Encode/Encode.xs b/ext/Encode/Encode.xs index 4e36a49583..bf2fd515e5 100644 --- a/ext/Encode/Encode.xs +++ b/ext/Encode/Encode.xs @@ -118,7 +118,7 @@ PerlIOEncode_popped(pTHX_ PerlIO * f) } if (e->dataSV) { SvREFCNT_dec(e->dataSV); - e->bufsv = Nullsv; + e->dataSV = Nullsv; } return 0; } @@ -227,7 +227,7 @@ PerlIOEncode_fill(pTHX_ PerlIO * f) SvPVX(e->dataSV) = (char *) ptr; SvLEN(e->dataSV) = 0; /* Hands off sv.c - it isn't yours */ SvCUR_set(e->dataSV,use); - SvPOK_on(e->dataSV); + SvPOK_only(e->dataSV); } SvUTF8_off(e->dataSV); PUSHMARK(sp); @@ -255,7 +255,7 @@ PerlIOEncode_fill(pTHX_ PerlIO * f) (The copy is a pain - need a put-it-here option for decode.) */ sv_setpvn(e->bufsv,s,len); - e->base.ptr = e->base.buf = (STDCHAR*)SvPVX(e->bufsv); + e->base.ptr = e->base.buf = (STDCHAR*)SvPVX(e->bufsv); e->base.end = e->base.ptr + SvCUR(e->bufsv); PerlIOBase(f)->flags |= PERLIO_F_RDBUF; SvUTF8_on(e->bufsv); @@ -356,6 +356,7 @@ PerlIOEncode_flush(pTHX_ PerlIO * f) SvPVX(str) = (char*)e->base.ptr; SvLEN(str) = 0; SvCUR_set(str, e->base.end - e->base.ptr); + SvPOK_only(str); SvUTF8_on(str); PUSHMARK(sp); XPUSHs(e->enc); @@ -433,7 +434,7 @@ PerlIOEncode_dup(pTHX_ PerlIO * f, PerlIO * o, PerlIO_funcs PerlIO_encode = { "encoding", sizeof(PerlIOEncode), - PERLIO_K_BUFFERED, + PERLIO_K_BUFFERED|PERLIO_K_DESTRUCT, PerlIOEncode_pushed, PerlIOEncode_popped, PerlIOBuf_open, @@ -500,7 +501,7 @@ encode_method(pTHX_ encode_t * enc, encpage_t * dir, SV * src, int code; while ((code = do_encode(dir, s, &slen, d, dlen, &dlen, !check))) { SvCUR_set(dst, dlen+ddone); - SvPOK_on(dst); + SvPOK_only(dst); #if 0 Perl_warn(aTHX_ "code=%d @ s=%d/%d/%d d=%d/%d/%d",code,slen,sdone,tlen,dlen,ddone,SvLEN(dst)-1); @@ -569,7 +570,7 @@ encode_method(pTHX_ encode_t * enc, encpage_t * dir, SV * src, } } SvCUR_set(dst, dlen+ddone); - SvPOK_on(dst); + SvPOK_only(dst); if (check) { sdone = SvCUR(src) - (slen+sdone); if (sdone) { @@ -580,7 +581,7 @@ encode_method(pTHX_ encode_t * enc, encpage_t * dir, SV * src, } else { SvCUR_set(dst, 0); - SvPOK_on(dst); + SvPOK_only(dst); } *SvEND(dst) = '\0'; return dst; diff --git a/ext/Encode/lib/Encode/Encoding.pm b/ext/Encode/lib/Encode/Encoding.pm index 1499955f33..a3b6310021 100644 --- a/ext/Encode/lib/Encode/Encoding.pm +++ b/ext/Encode/lib/Encode/Encoding.pm @@ -20,5 +20,7 @@ sub fromUnicode { shift->encode(@_) } sub new_sequence { return $_[0] } +sub DESTROY {} + 1; __END__ |