diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-03 02:44:40 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-03 02:44:40 +0000 |
| commit | 0121b80e4f69c2ad9631e8d20b5c91f3b2a40434 (patch) | |
| tree | 49a8ade446c1b6277c06982988700467e1be139c /gnu/usr.bin/perl/pp_sort.c | |
| parent | 184128d6fb928711cdef9d8e6980dc6601fb1f87 (diff) | |
perl 5.8.2 from CPAN
Diffstat (limited to 'gnu/usr.bin/perl/pp_sort.c')
| -rw-r--r-- | gnu/usr.bin/perl/pp_sort.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/usr.bin/perl/pp_sort.c b/gnu/usr.bin/perl/pp_sort.c index d2d4bdee0a0..26ea9c06b49 100644 --- a/gnu/usr.bin/perl/pp_sort.c +++ b/gnu/usr.bin/perl/pp_sort.c @@ -1,6 +1,7 @@ /* pp_sort.c * - * Copyright (c) 1991-2002, Larry Wall + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + * 2000, 2001, 2002, 2003, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -1455,8 +1456,8 @@ PP(pp_sort) else if (gv) { SV *tmpstr = sv_newmortal(); gv_efullname3(tmpstr, gv, Nullch); - DIE(aTHX_ "Undefined sort subroutine \"%s\" called", - SvPVX(tmpstr)); + DIE(aTHX_ "Undefined sort subroutine \"%"SVf"\" called", + tmpstr); } else { DIE(aTHX_ "Undefined subroutine in sort"); @@ -1470,8 +1471,7 @@ PP(pp_sort) SAVEVPTR(CvROOT(cv)->op_ppaddr); CvROOT(cv)->op_ppaddr = PL_ppaddr[OP_NULL]; - SAVEVPTR(PL_curpad); - PL_curpad = AvARRAY((AV*)AvARRAY(CvPADLIST(cv))[1]); + PAD_SET_CUR(CvPADLIST(cv), 1); } } } @@ -1535,13 +1535,13 @@ PP(pp_sort) if (hasargs && !is_xsub) { /* This is mostly copied from pp_entersub */ - AV *av = (AV*)PL_curpad[0]; + AV *av = (AV*)PAD_SVl(0); #ifndef USE_5005THREADS cx->blk_sub.savearray = GvAV(PL_defgv); GvAV(PL_defgv) = (AV*)SvREFCNT_inc(av); #endif /* USE_5005THREADS */ - cx->blk_sub.oldcurpad = PL_curpad; + CX_CURPAD_SAVE(cx->blk_sub); cx->blk_sub.argarray = av; } sortsv((myorigmark+1), max, @@ -1614,7 +1614,7 @@ sortcv_stacked(pTHX_ SV *a, SV *b) AV *av; #ifdef USE_5005THREADS - av = (AV*)PL_curpad[0]; + av = (AV*)PAD_SVl(0); #else av = GvAV(PL_defgv); #endif |