From: Jarkko Hietaniemi Date: Wed, 22 Jan 2003 03:45:01 +0000 (+0000) Subject: Continuation of #18542. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bdf77a2af039cc96899b27672b758a8e2363d4ae;p=p5sagit%2Fp5-mst-13.2.git Continuation of #18542. p4raw-id: //depot/perl@18544 --- diff --git a/sv.c b/sv.c index caa533a..36c9f80 100644 --- a/sv.c +++ b/sv.c @@ -5683,21 +5683,21 @@ Perl_sv_pos_u2b(pTHX_ register SV *sv, I32* offsetp, I32* lenp) MAGIC *mg = 0; bool found = FALSE; - if (S_utf8_mg_pos(sv, &mg, &cache, 0, offsetp, *offsetp, &s, start, send)) + if (utf8_mg_pos(sv, &mg, &cache, 0, offsetp, *offsetp, &s, start, send)) found = TRUE; if (!found && uoffset > 0) { while (s < send && uoffset--) s += UTF8SKIP(s); if (s >= send) s = send; - if (S_utf8_mg_pos_init(sv, &mg, &cache, 0, offsetp, s, start)) + if (utf8_mg_pos_init(sv, &mg, &cache, 0, offsetp, s, start)) boffset = cache[1]; *offsetp = s - start; } if (lenp) { found = FALSE; start = s; - if (S_utf8_mg_pos(sv, &mg, &cache, 2, lenp, *lenp + *offsetp, &s, start, send)) { + if (utf8_mg_pos(sv, &mg, &cache, 2, lenp, *lenp + *offsetp, &s, start, send)) { *lenp -= boffset; found = TRUE; } @@ -5708,7 +5708,7 @@ Perl_sv_pos_u2b(pTHX_ register SV *sv, I32* offsetp, I32* lenp) s += UTF8SKIP(s); if (s >= send) s = send; - if (S_utf8_mg_pos_init(sv, &mg, &cache, 2, lenp, s, start)) + if (utf8_mg_pos_init(sv, &mg, &cache, 2, lenp, s, start)) cache[2] += *offsetp; } *lenp = s - start;