Change 12619 by jhi@alpha on 2001/10/24 13:06:24
Rewrite sv_uni_display() as pv_uni_display() as
reimplement sv_uni_display() using that.
Affected files ...
... //depot/perl/dump.c#100 edit
... //depot/perl/embed.h#299 edit
... //depot/perl/embed.pl#286 edit
... //depot/perl/proto.h#341 edit
Differences ...
==== //depot/perl/dump.c#100 (text) ====
Index: perl/dump.c
--- perl/dump.c.~1~ Wed Oct 24 07:15:05 2001
+++ perl/dump.c Wed Oct 24 07:15:05 2001
@@ -143,13 +143,13 @@
}
char *
-Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim, UV flags)
+Perl_pv_uni_display(pTHX_ SV *dsv, U8 *spv, STRLEN len, STRLEN pvlim, UV flags)
{
int truncated = 0;
char *s, *e;
sv_setpvn(dsv, "", 0);
- for (s = SvPVX(ssv), e = s + SvCUR(ssv); s < e; s += UTF8SKIP(s)) {
+ for (s = (char *)spv, e = s + len; s < e; s += UTF8SKIP(s)) {
UV u;
if (pvlim && SvCUR(dsv) >= pvlim) {
truncated++;
@@ -165,6 +165,13 @@
}
char *
+Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim, UV flags)
+{
+ return Perl_pv_uni_display(aTHX_ dsv, (U8*)SvPVX(ssv), SvCUR(ssv),
+ pvlim, flags);
+}
+
+char *
Perl_sv_peek(pTHX_ SV *sv)
{
SV *t = sv_newmortal();
==== //depot/perl/embed.h#299 (text+w) ====
Index: perl/embed.h
--- perl/embed.h.~1~ Wed Oct 24 07:15:05 2001
+++ perl/embed.h Wed Oct 24 07:15:05 2001
@@ -804,6 +804,7 @@
#define sv_usepvn_mg Perl_sv_usepvn_mg
#define get_vtbl Perl_get_vtbl
#define pv_display Perl_pv_display
+#define pv_uni_display Perl_pv_uni_display
#define sv_uni_display Perl_sv_uni_display
#define dump_indent Perl_dump_indent
#define dump_vindent Perl_dump_vindent
@@ -2311,6 +2312,7 @@
#define sv_usepvn_mg(a,b,c) Perl_sv_usepvn_mg(aTHX_ a,b,c)
#define get_vtbl(a) Perl_get_vtbl(aTHX_ a)
#define pv_display(a,b,c,d,e) Perl_pv_display(aTHX_ a,b,c,d,e)
+#define pv_uni_display(a,b,c,d,e) Perl_pv_uni_display(aTHX_ a,b,c,d,e)
#define sv_uni_display(a,b,c,d) Perl_sv_uni_display(aTHX_ a,b,c,d)
#define dump_vindent(a,b,c,d) Perl_dump_vindent(aTHX_ a,b,c,d)
#define do_gv_dump(a,b,c,d) Perl_do_gv_dump(aTHX_ a,b,c,d)
==== //depot/perl/embed.pl#286 (xtext) ====
Index: perl/embed.pl
--- perl/embed.pl.~1~ Wed Oct 24 07:15:05 2001
+++ perl/embed.pl Wed Oct 24 07:15:05 2001
@@ -1904,6 +1904,8 @@
Ap |MGVTBL*|get_vtbl |int vtbl_id
p |char* |pv_display |SV *dsv|char *pv|STRLEN cur|STRLEN len \
|STRLEN pvlim
+p |char* |pv_uni_display |SV *dsv|U8 *spv|STRLEN len \
+ |STRLEN pvlim|UV flags
p |char* |sv_uni_display |SV *dsv|SV *ssv|STRLEN pvlim|UV flags
Afp |void |dump_indent |I32 level|PerlIO *file|const char* pat|...
Ap |void |dump_vindent |I32 level|PerlIO *file|const char* pat \
==== //depot/perl/proto.h#341 (text+w) ====
Index: perl/proto.h
--- perl/proto.h.~1~ Wed Oct 24 07:15:05 2001
+++ perl/proto.h Wed Oct 24 07:15:05 2001
@@ -897,6 +897,7 @@
PERL_CALLCONV void Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len);
PERL_CALLCONV MGVTBL* Perl_get_vtbl(pTHX_ int vtbl_id);
PERL_CALLCONV char* Perl_pv_display(pTHX_ SV *dsv, char *pv, STRLEN cur, STRLEN
len, STRLEN pvlim);
+PERL_CALLCONV char* Perl_pv_uni_display(pTHX_ SV *dsv, U8 *spv, STRLEN len, STRLEN
+pvlim, UV flags);
PERL_CALLCONV char* Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim, UV
flags);
PERL_CALLCONV void Perl_dump_indent(pTHX_ I32 level, PerlIO *file, const char*
pat, ...)
#ifdef CHECK_FORMAT
End of Patch.
