Skip to content

vutil.c: Use new SvVSTRING() macro #23154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

vutil.c: Use new SvVSTRING() macro #23154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions vutil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,9 @@ Perl_new_version(pTHX_ SV *ver)
}
#ifdef SvVOK
{
const MAGIC* const mg = SvVSTRING_mg(ver);
if ( mg ) { /* already a v-string */
const STRLEN len = mg->mg_len;
const char * const version = (const char*)mg->mg_ptr;
if (SvVOK(ver)) { /* already a v-string */
STRLEN len;
const char * const version = SvVSTRING(ver, len);
char *raw, *under;
static const char underscore[] = "_";
sv_setpvn(rv,version,len);
Expand Down Expand Up @@ -618,9 +617,6 @@ Perl_upg_version(pTHX_ SV *ver, bool qv)
#endif
{
const char *version, *s;
#ifdef SvVOK
const MAGIC *mg;
#endif

#if PERL_VERSION_LT(5,19,8) && defined(USE_ITHREADS)
ENTER;
Expand Down Expand Up @@ -820,8 +816,10 @@ Perl_upg_version(pTHX_ SV *ver, bool qv)
SvREFCNT_dec(sv);
}
#ifdef SvVOK
else if ( (mg = SvVSTRING_mg(ver)) ) { /* already a v-string */
version = savepvn( (const char*)mg->mg_ptr,mg->mg_len );
else if (SvVOK(ver)) { /* already a v-string */
STRLEN len;
const char *pv = SvVSTRING(ver, len);
version = savepvn(pv, len);
SAVEFREEPV(version);
qv = TRUE;
}
Expand Down
Loading