From 575b23284411af3254e5388f6a05d36939ea2636 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 18 Jun 2020 14:52:19 +0200 Subject: [PATCH] Fix some inappropriate format specifiers A "0x" prefix suggest hexadecimal values, not decimal. --- vncviewer/XInputTouchHandler.cxx | 6 +++--- vncviewer/touch.cxx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vncviewer/XInputTouchHandler.cxx b/vncviewer/XInputTouchHandler.cxx index 359802ea..6203bda5 100644 --- a/vncviewer/XInputTouchHandler.cxx +++ b/vncviewer/XInputTouchHandler.cxx @@ -99,9 +99,9 @@ bool XInputTouchHandler::grabPointer() curmasks = XIGetSelectedEvents(fl_display, wnd, &num_masks); if (curmasks == NULL) { if (num_masks == -1) - vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lu"), wnd); + vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lx"), wnd); else - vlog.error(_("Window 0x%08lu has no X Input 2 event mask"), wnd); + vlog.error(_("Window 0x%08lx has no X Input 2 event mask"), wnd); return false; } @@ -109,7 +109,7 @@ bool XInputTouchHandler::grabPointer() // Our windows should only have a single mask, which allows us to // simplify all the code handling the masks if (num_masks > 1) { - vlog.error(_("Window 0x%08lu has more than one X Input 2 event mask"), wnd); + vlog.error(_("Window 0x%08lx has more than one X Input 2 event mask"), wnd); return false; } diff --git a/vncviewer/touch.cxx b/vncviewer/touch.cxx index a2ee3e69..d169deb9 100644 --- a/vncviewer/touch.cxx +++ b/vncviewer/touch.cxx @@ -104,14 +104,14 @@ static void x11_change_touch_ownership(bool enable) curmasks = XIGetSelectedEvents(fl_display, iter->first, &num_masks); if (curmasks == NULL) { if (num_masks == -1) - vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lu"), iter->first); + vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lx"), iter->first); continue; } // Our windows should only have a single mask, which allows us to // simplify all the code handling the masks if (num_masks > 1) { - vlog.error(_("Window 0x%08lu has more than one X Input 2 event mask"), iter->first); + vlog.error(_("Window 0x%08lx has more than one X Input 2 event mask"), iter->first); continue; } @@ -135,7 +135,7 @@ bool x11_grab_pointer(Window window) bool ret; if (handlers.count(window) == 0) { - vlog.error(_("Invalid window 0x%08lu specified for pointer grab"), window); + vlog.error(_("Invalid window 0x%08lx specified for pointer grab"), window); return BadWindow; } @@ -157,7 +157,7 @@ bool x11_grab_pointer(Window window) void x11_ungrab_pointer(Window window) { if (handlers.count(window) == 0) { - vlog.error(_("Invalid window 0x%08lu specified for pointer grab"), window); + vlog.error(_("Invalid window 0x%08lx specified for pointer grab"), window); return; } -- 2.39.5