1 files changed, 8 insertions, 8 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);