From eeaa50cc8bee7e926cf76d8fc4a212cc36fad252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= Date: Sat, 19 Oct 2019 15:36:30 +0200 Subject: Fully spell out "subroutine" and "variable" A bunch of places were using "%se" and "subroutin" or "variabl" when generating error messages that could refer to either a subroutine or variable. Spell the words out and use plain "%s" instead. --- pad.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pad.c') diff --git a/pad.c b/pad.c index 7854678928..7a03be1f87 100644 --- a/pad.c +++ b/pad.c @@ -1086,10 +1086,10 @@ S_unavailable(pTHX_ PADNAME *name) { /* diag_listed_as: Variable "%s" is not available */ Perl_ck_warner(aTHX_ packWARN(WARN_CLOSURE), - "%se \"%" PNf "\" is not available", + "%s \"%" PNf "\" is not available", *PadnamePV(name) == '&' - ? "Subroutin" - : "Variabl", + ? "Subroutine" + : "Variable", PNfARG(name)); } @@ -1205,8 +1205,8 @@ S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, /* diag_listed_as: Variable "%s" will not stay shared */ Perl_warner(aTHX_ packWARN(WARN_CLOSURE), - "%se \"%" UTF8f "\" will not stay shared", - *namepv == '&' ? "Subroutin" : "Variabl", + "%s \"%" UTF8f "\" will not stay shared", + *namepv == '&' ? "Subroutine" : "Variable", UTF8fARG(1, namelen, namepv)); } -- cgit v1.2.1