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/common | |
| 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/common')
| -rw-r--r-- | src/perl/common/Core.xs | 16 | ||||
| -rw-r--r-- | src/perl/common/Expando.xs | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs index 84f660ba..bfe2efde 100644 --- a/src/perl/common/Core.xs +++ b/src/perl/common/Core.xs @@ -49,11 +49,11 @@ static void handle_command_bind(int priority, int items, SV *p0, SV *p1, SV *p2) if (!hash) { category = items < 3 ? DEFAULT_COMMAND_CATEGORY : - (char *)SvPV(p2, PL_na); - perl_command_bind_to((char *)SvPV(p0, PL_na), category, p1, priority); + SvPV_nolen(p2); + perl_command_bind_to(SvPV_nolen(p0), category, p1, priority); } else { category = items < 2 ? DEFAULT_COMMAND_CATEGORY : - (char *)SvPV(p1, PL_na); + SvPV_nolen(p1); perl_command_bind_add_hash(priority, p0, category); } } @@ -117,7 +117,7 @@ CODE: if (items != 1 && items != 2) croak("Usage: Irssi::signal_add(signal, func)"); if (items == 2) - perl_signal_add_full((char *)SvPV(ST(0),PL_na), ST(1), + perl_signal_add_full(SvPV_nolen(ST(0)), ST(1), SIGNAL_PRIORITY_DEFAULT); else perl_signal_add_hash(SIGNAL_PRIORITY_DEFAULT, ST(0)); @@ -128,7 +128,7 @@ CODE: if (items != 1 && items != 2) croak("Usage: Irssi::signal_add_first(signal, func)"); if (items == 2) - perl_signal_add_full((char *)SvPV(ST(0),PL_na), ST(1), + perl_signal_add_full(SvPV_nolen(ST(0)), ST(1), SIGNAL_PRIORITY_HIGH); else perl_signal_add_hash(SIGNAL_PRIORITY_HIGH, ST(0)); @@ -139,7 +139,7 @@ CODE: if (items != 1 && items != 2) croak("Usage: Irssi::signal_add_last(signal, func)"); if (items == 2) - perl_signal_add_full((char *)SvPV(ST(0),PL_na), ST(1), + perl_signal_add_full(SvPV_nolen(ST(0)), ST(1), SIGNAL_PRIORITY_LOW); else perl_signal_add_hash(SIGNAL_PRIORITY_LOW, ST(0)); @@ -150,7 +150,7 @@ CODE: if (items != 2 && items != 3) croak("Usage: Irssi::signal_add_priority(signal, func, priority)"); if (items == 3) - perl_signal_add_full((char *)SvPV(ST(0),PL_na), ST(1), SvIV(ST(2))); + perl_signal_add_full(SvPV_nolen(ST(0)), ST(1), SvIV(ST(2))); else perl_signal_add_hash(SvIV(ST(0)), ST(1)); @@ -180,7 +180,7 @@ CODE: if (len > 6) len = 6; for (pos = 0; pos < len; pos++) { SV **val = av_fetch(av, pos, 0); - arr[pos] = SvPV(*val, PL_na); + arr[pos] = SvPV_nolen(*val); } arr[pos] = NULL; perl_signal_register(key, arr); diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs index e1dd89ab..375a4c2f 100644 --- a/src/perl/common/Expando.xs +++ b/src/perl/common/Expando.xs @@ -78,7 +78,7 @@ static char *perl_expando_event(PerlExpando *rec, SERVER_REC *server, if (rec->script != NULL) script_unregister_expandos(rec->script); - signal_emit("script error", 2, rec->script, SvPV(ERRSV, PL_na)); + signal_emit("script error", 2, rec->script, SvPV_nolen(ERRSV)); } else if (retcount > 0) { ret = g_strdup(POPp); *free_ret = TRUE; @@ -118,7 +118,7 @@ static void expando_signals_add_hash(const char *key, SV *signals) hv_iterinit(hv); while ((he = hv_iternext(hv)) != NULL) { SV *argsv = HeVAL(he); - argstr = SvPV(argsv, PL_na); + argstr = SvPV_nolen(argsv); if (g_ascii_strcasecmp(argstr, "none") == 0) arg = EXPANDO_ARG_NONE; |