[PATCH] correct format warnings

Repeat of patch to correct format warnings (found with -DCHECK_FORMAT)
applies to 5.8.6

Robin



-------------------------------------------------------------------
This e-mail and any attachments may contain confidential and/or
privileged material; it is for the intended addressee(s) only.
If you are not a named addressee, you must not use, retain or
disclose such information.

NPL Management Ltd cannot guarantee that the e-mail or any
attachments are free from viruses.

NPL Management Ltd. Registered in England and Wales. No: 2937881
Registered Office: Teddington, Middlesex, United Kingdom TW11 0LW.
-------------------------------------------------------------------

• [PATCH] correct format warnings by Robin Barker
• Re: [PATCH] correct format warnings by Nicholas Clark