From 313d65ca2545534bba369331068bb57e65ac9318 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Mon, 8 Jun 2020 15:22:10 +0000 Subject: test: v4l2_subdevice: list_formats: Port to use utils::hex() output helper The hex stream output helper was introduced in f391048a7b98 ("libcamera: utils: Add hex stream output helper"). It simplifies writing hexadecimal values to an ostream which can be used in this test too. As the helper doesn't modify the stream configuration (refer to utils::hex() documentation), this eliminates the need of restoring the stream's format state as pointed out by the coverity scan. Reported-by: Coverity CID=279058 Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- test/v4l2_subdevice/list_formats.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'test/v4l2_subdevice') diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp index 25503c33..a55af110 100644 --- a/test/v4l2_subdevice/list_formats.cpp +++ b/test/v4l2_subdevice/list_formats.cpp @@ -5,12 +5,12 @@ * libcamera V4L2 Subdevice format handling test */ -#include #include #include #include +#include "libcamera/internal/utils.h" #include "libcamera/internal/v4l2_subdevice.h" #include "v4l2_subdevice_test.h" @@ -36,8 +36,7 @@ void ListFormatsTest::printFormats(unsigned int pad, { cout << "Enumerate formats on pad " << pad << endl; for (const SizeRange &size : sizes) { - cout << " mbus code: 0x" << setfill('0') << setw(4) - << hex << code << endl; + cout << " mbus code: " << utils::hex(code, 4) << endl; cout << " min width: " << dec << size.min.width << endl; cout << " min height: " << dec << size.min.height << endl; cout << " max width: " << dec << size.max.width << endl; -- cgit v1.2.1