diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2003-01-13 23:10:55 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-01-13 23:10:55 +0000 |
| commit | 0f7c507f688c1f7ff05ce69abb8332c23e7ec07d (patch) | |
| tree | f2a9b3106903e5b3fb9e87e5eea7e2237dee822a /ext/Encode/Unicode | |
| parent | 9646e71393b83497952a662971ad457dd66fbbd9 (diff) | |
| download | perl-0f7c507f688c1f7ff05ce69abb8332c23e7ec07d.tar.gz | |
Upgrade to Encode 1.84.
p4raw-id: //depot/perl@18478
Diffstat (limited to 'ext/Encode/Unicode')
| -rw-r--r-- | ext/Encode/Unicode/Unicode.xs | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/ext/Encode/Unicode/Unicode.xs b/ext/Encode/Unicode/Unicode.xs index 7c79d4a8eb..616401a21d 100644 --- a/ext/Encode/Unicode/Unicode.xs +++ b/ext/Encode/Unicode/Unicode.xs @@ -1,5 +1,5 @@ /* - $Id: Unicode.xs,v 1.5 2002/05/20 15:25:44 dankogai Exp $ + $Id: Unicode.xs,v 1.6 2003/01/10 12:00:16 dankogai Exp dankogai $ */ #define PERL_NO_GET_CONTEXT @@ -113,8 +113,8 @@ CODE: endian = 'V'; } else { - croak("%s:Unregognised BOM %"UVxf, - SvPV_nolen(*hv_fetch((HV *)SvRV(obj),"Name",4,0)), + croak("%"SVf":Unregognised BOM %"UVxf, + *hv_fetch((HV *)SvRV(obj),"Name",4,0), bom); } } @@ -129,8 +129,8 @@ CODE: if (size != 4 && invalid_ucs2(ord)) { if (ucs2) { if (check) { - croak("%s:no surrogates allowed %"UVxf, - SvPV_nolen(*hv_fetch((HV *)SvRV(obj),"Name",4,0)), + croak("%"SVf":no surrogates allowed %"UVxf, + *hv_fetch((HV *)SvRV(obj),"Name",4,0), ord); } if (s+size <= e) { @@ -142,8 +142,8 @@ CODE: else { UV lo; if (!isHiSurrogate(ord)) { - croak("%s:Malformed HI surrogate %"UVxf, - SvPV_nolen(*hv_fetch((HV *)SvRV(obj),"Name",4,0)), + croak("%"SVf":Malformed HI surrogate %"UVxf, + *hv_fetch((HV *)SvRV(obj),"Name",4,0), ord); } if (s+size > e) { @@ -153,8 +153,8 @@ CODE: } lo = enc_unpack(aTHX_ &s,e,size,endian); if (!isLoSurrogate(lo)){ - croak("%s:Malformed LO surrogate %"UVxf, - SvPV_nolen(*hv_fetch((HV *)SvRV(obj),"Name",4,0)), + croak("%"SVf":Malformed LO surrogate %"UVxf, + *hv_fetch((HV *)SvRV(obj),"Name",4,0), ord); } ord = 0x10000 + ((ord - 0xD800) << 10) + (lo - 0xDC00); @@ -165,8 +165,8 @@ CODE: SvCUR_set(result,d - (U8 *)SvPVX(result)); } if (s < e) { - Perl_warner(aTHX_ packWARN(WARN_UTF8),"%s:Partial character", - SvPV_nolen(*hv_fetch((HV *)SvRV(obj),"Name",4,0))); + Perl_warner(aTHX_ packWARN(WARN_UTF8),"%"SVf":Partial character", + *hv_fetch((HV *)SvRV(obj),"Name",4,0)); } if (check && !(check & ENCODE_LEAVE_SRC)){ if (s < e) { @@ -212,10 +212,8 @@ CODE: if (!issurrogate(ord)){ if (ucs2) { if (check) { - croak("%s:code point \"\\x{%"UVxf"}\" too high", - SvPV_nolen( - *hv_fetch((HV *)SvRV(obj),"Name",4,0)) - ,ord); + croak("%"SVf":code point \"\\x{%"UVxf"}\" too high", + *hv_fetch((HV *)SvRV(obj),"Name",4,0),ord); } enc_pack(aTHX_ result,size,endian,FBCHAR); }else{ @@ -235,8 +233,8 @@ CODE: } } if (s < e) { - Perl_warner(aTHX_ packWARN(WARN_UTF8),"%s:Partial character", - SvPV_nolen(*hv_fetch((HV *)SvRV(obj),"Name",4,0))); + Perl_warner(aTHX_ packWARN(WARN_UTF8),"%"SVf":Partial character", + *hv_fetch((HV *)SvRV(obj),"Name",4,0)); } if (check && !(check & ENCODE_LEAVE_SRC)){ if (s < e) { |