diff options
| author | Alexander Færøy <ahf@0x90.dk> | 2014-06-27 14:31:04 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@0x90.dk> | 2014-06-27 14:31:04 +0200 |
| commit | b8c2915d79a1e0ccec92e627b716fe0a6af81fc6 (patch) | |
| tree | 57f01b2716bd7ab4159eb68ac5fb9aec88a48d59 /src/perl/ui | |
| parent | e4051eb42e7ab9965c9e523c443dca26326ef73a (diff) | |
| parent | f58a461c54f2189543d64303e8c80bacda78448d (diff) | |
| download | irssi-b8c2915d79a1e0ccec92e627b716fe0a6af81fc6.zip | |
Merge pull request #59 from ailin-nemui/perl-pl-na
get rid of PL_na
Diffstat (limited to 'src/perl/ui')
| -rw-r--r-- | src/perl/ui/Formats.xs | 2 | ||||
| -rw-r--r-- | src/perl/ui/Themes.xs | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/perl/ui/Formats.xs b/src/perl/ui/Formats.xs index 5c59bc5c..c10f0b4e 100644 --- a/src/perl/ui/Formats.xs +++ b/src/perl/ui/Formats.xs @@ -90,7 +90,7 @@ PREINIT: PPCODE: charargs = g_new0(char *, items-5+1); for (n = 5; n < items; n++) { - charargs[n-5] = (char *)SvPV(ST(n), PL_na); + charargs[n-5] = SvPV_nolen(ST(n)); } format_create_dest(&dest, server, target, 0, window); diff --git a/src/perl/ui/Themes.xs b/src/perl/ui/Themes.xs index 1a782dc0..dc5f6272 100644 --- a/src/perl/ui/Themes.xs +++ b/src/perl/ui/Themes.xs @@ -106,8 +106,8 @@ CODE: formatrecs[0].def = g_strdup("Perl script"); for (fpos = 1, n = 0; n < len; n++, fpos++) { - key = SvPV(*av_fetch(av, n, 0), PL_na); n++; - value = SvPV(*av_fetch(av, n, 0), PL_na); + key = SvPV_nolen(*av_fetch(av, n, 0)); n++; + value = SvPV_nolen(*av_fetch(av, n, 0)); formatrecs[fpos].tag = g_strdup(key); formatrecs[fpos].def = g_strdup(value); @@ -128,7 +128,7 @@ CODE: format_create_dest(&dest, NULL, NULL, level, NULL); memset(arglist, 0, sizeof(arglist)); for (n = 2; n < items && n < MAX_FORMAT_PARAMS+2; n++) { - arglist[n-2] = SvPV(ST(n), PL_na); + arglist[n-2] = SvPV_nolen(ST(n)); } printformat_perl(&dest, format, arglist); @@ -149,8 +149,8 @@ CODE: croak("abstracts list is invalid - not divisible by 2 (%d)", len); for (i = 0; i < len; i++) { - key = SvPV(*av_fetch(av, i, 0), PL_na); i++; - value = SvPV(*av_fetch(av, i, 0), PL_na); + key = SvPV_nolen(*av_fetch(av, i, 0)); i++; + value = SvPV_nolen(*av_fetch(av, i, 0)); theme_set_default_abstract(key, value); } @@ -177,7 +177,7 @@ CODE: format_create_dest(&dest, server, target, level, NULL); memset(arglist, 0, sizeof(arglist)); for (n = 4; n < items && n < MAX_FORMAT_PARAMS+4; n++) { - arglist[n-4] = SvPV(ST(n), PL_na); + arglist[n-4] = SvPV_nolen(ST(n)); } printformat_perl(&dest, format, arglist); @@ -199,7 +199,7 @@ CODE: format_create_dest(&dest, NULL, NULL, level, window); memset(arglist, 0, sizeof(arglist)); for (n = 3; n < items && n < MAX_FORMAT_PARAMS+3; n++) { - arglist[n-3] = SvPV(ST(n), PL_na); + arglist[n-3] = SvPV_nolen(ST(n)); } printformat_perl(&dest, format, arglist); @@ -221,7 +221,7 @@ CODE: format_create_dest(&dest, item->server, item->visible_name, level, NULL); memset(arglist, 0, sizeof(arglist)); for (n = 3; n < items && n < MAX_FORMAT_PARAMS+3; n++) { - arglist[n-3] = SvPV(ST(n), PL_na); + arglist[n-3] = SvPV_nolen(ST(n)); } printformat_perl(&dest, format, arglist); |