From 103e774d465c9455630832118b53cd26c4023b8b Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Sat, 6 Jul 2019 09:05:58 +0900 Subject: [PATCH] media-add-ons/usb_webcam: Fix -Wformat= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I85734ac3b01beb6e6a69ebda5050715c1fa1342d Reviewed-on: https://review.haiku-os.org/c/1562 Reviewed-by: Stephan Aßmus --- .../media-add-ons/usb_webcam/Producer.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp b/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp index 2ef797c8f5..1b72f92f91 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp +++ b/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp @@ -289,7 +289,8 @@ VideoProducer::HandleEvent(const media_timed_event *event, case BTimedEventQueue::B_DATA_STATUS: case BTimedEventQueue::B_PARAMETER: default: - PRINTF(-1, ("HandleEvent: Unhandled event -- %lx\n", event->type)); + PRINTF(-1, ("HandleEvent: Unhandled event -- %" B_PRIx32 "\n", + event->type)); break; } } @@ -335,7 +336,7 @@ VideoProducer::FormatSuggestionRequested( TOUCH(quality); - PRINTF(1, ("FormatSuggestionRequested() %ldx%ld\n", \ + PRINTF(1, ("FormatSuggestionRequested() %" B_PRIu32 "x%" B_PRIu32 "\n", \ format->u.raw_video.display.line_width, \ format->u.raw_video.display.line_count)); @@ -361,7 +362,7 @@ VideoProducer::FormatProposal(const media_source &output, media_format *format) if (output != fOutput.source) return B_MEDIA_BAD_SOURCE; - PRINTF(1, ("FormatProposal() %ldx%ld\n", \ + PRINTF(1, ("FormatProposal() %" B_PRIu32 "x%" B_PRIu32 "\n", \ format->u.raw_video.display.line_width, \ format->u.raw_video.display.line_count)); @@ -381,7 +382,7 @@ VideoProducer::FormatProposal(const media_source &output, media_format *format) } } - PRINTF(1, ("FormatProposal: %ldx%ld\n", \ + PRINTF(1, ("FormatProposal: %" B_PRIu32 "x%" B_PRIu32 "\n", \ format->u.raw_video.display.line_width, \ format->u.raw_video.display.line_count)); @@ -464,7 +465,7 @@ VideoProducer::PrepareToConnect(const media_source &source, { status_t err; - PRINTF(1, ("PrepareToConnect() %ldx%ld\n", \ + PRINTF(1, ("PrepareToConnect() %" B_PRIu32 "x%" B_PRIu32 "\n", \ format->u.raw_video.display.line_width, \ format->u.raw_video.display.line_count)); @@ -539,7 +540,7 @@ VideoProducer::Connect(status_t error, const media_source &source, const media_destination &destination, const media_format &format, char *io_name) { - PRINTF(1, ("Connect() %ldx%ld\n", \ + PRINTF(1, ("Connect() %" B_PRIu32 "x%" B_PRIu32 "\n", \ format.u.raw_video.display.line_width, \ format.u.raw_video.display.line_count)); @@ -785,7 +786,7 @@ VideoProducer::HandleStart(bigtime_t performance_time) { /* Start producing frames, even if the output hasn't been connected yet. */ - PRINTF(1, ("HandleStart(%Ld)\n", performance_time)); + PRINTF(1, ("HandleStart(%" B_PRIdBIGTIME ")\n", performance_time)); if (fRunning) { PRINTF(-1, ("HandleStart: Node already started\n")); @@ -889,7 +890,10 @@ VideoProducer::FrameGenerator() bigtime_t wait_until = system_time(); while (1) { - PRINTF(1, ("FrameGenerator: acquire_sem_etc() until %Ldµs (in %Ldµs)\n", wait_until, wait_until - system_time())); + PRINTF(1, ("FrameGenerator: " \ + "acquire_sem_etc() until %" B_PRIdBIGTIME "µs " \ + "(in %" B_PRIdBIGTIME "µs)\n", \ + wait_until, wait_until - system_time())); status_t err = acquire_sem_etc(fFrameSync, 1, B_ABSOLUTE_TIMEOUT, wait_until);