Integrate:

[ 34694]
Explicitly specify some printf formats for constant strings.
This is mostly to silence gcc's warning, "format not a string
literal and no format arguments".

[ 34695]
Subject: [PATCH] explicit empty while loops
From: "Robin Barker" <Robin.Barker@npl.co.uk>
Message-ID: <46A0F33545E63740BC7563DE59CA9C6D4E2FD9@exchsvr2.npl.ad.local>

[ 34700]
Silence one more format warning
p4raw-link: @34700 on //depot/perl: 76c6a2133b7f687937d91eb41bb4c9f222c0d5b0
p4raw-link: @34695 on //depot/perl: 47127b64dd369017e77ff2eac9a6d3c02398507b
p4raw-link: @34694 on //depot/perl: f1f66076265cc2bac3adabd54c01b0dea28ca3f0

p4raw-id: //depot/maint-5.10/perl@34707
p4raw-integrated: from //depot/perl@34704 'copy in'
	ext/PerlIO/scalar/scalar.xs (@33280..) 'merge in' handy.h
	(@34679..)
p4raw-integrated: from //depot/perl@34695 'merge in' op.c (@34679..)
p4raw-integrated: from //depot/perl@34694 'edit in' pp_sort.c
	(@34675..) 'merge in' toke.c (@34671..) doop.c perl.c regcomp.c
	(@34675..) av.c (@34677..) mg.c pp.c pp_hot.c pp_sys.c sv.c
	universal.c util.c (@34679..) pp_ctl.c (@34693..)

1 files changed, 1 insertions, 1 deletions

diff --git a/op.c b/op.c
index a025c8936c..c08eb84f59 100644
--- a/op.c
+++ b/op.c
@@ -7769,7 +7769,7 @@ Perl_ck_subr(pTHX_ OP *o)
 		         const char *p = proto;
 			 const char *const end = proto;
 			 contextclass = 0;
-			 while (*--p != '[');
+			 while (*--p != '[') {}
 			 bad_type(arg, Perl_form(aTHX_ "one of %.*s",
 						 (int)(end - p), p),
 				  gv_ename(namegv), o3);