From b3a8bb872deb32a0273e5761e16b0ecb2061ab64 Mon Sep 17 00:00:00 2001 From: spang Date: Thu, 25 Jun 2015 12:39:49 -0700 Subject: ozone: evdev: Fix printf format string issues on 32-bit Fix some erroneous format strings on 32-bit builds. These trigger warnings in the build. BUG=none TEST=cros chrome-sdk --board=x86-alex_freon gclient runhooks ninja -C out_x86-alex_freon/Release chrome events_unittests Review URL: https://codereview.chromium.org/1210203002 Cr-Commit-Position: refs/heads/master@{#336230} --- ui/events/ozone/evdev/event_device_test_util.cc | 2 +- ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/events/ozone/evdev/event_device_test_util.cc b/ui/events/ozone/evdev/event_device_test_util.cc index 4d5407c..857c841 100644 --- a/ui/events/ozone/evdev/event_device_test_util.cc +++ b/ui/events/ozone/evdev/event_device_test_util.cc @@ -27,7 +27,7 @@ std::string SerializeBitfield(unsigned long* bitmap, int max) { for (int i = EVDEV_BITS_TO_GROUPS(max) - 1; i >= 0; i--) { if (bitmap[i] || ret.size()) { - base::StringAppendF(&ret, "%" PRIx64, bitmap[i]); + base::StringAppendF(&ret, "%lx", bitmap[i]); if (i > 0) ret += " "; diff --git a/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc b/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc index 3b578a3..5bbafb3 100644 --- a/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc +++ b/ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc @@ -53,7 +53,7 @@ class TouchNoiseFinderTest : public testing::Test { size_t slot = touches[j].slot; if (touch_noise_finder_->SlotHasNoise(slot) != expect_noise) { LOG(ERROR) << base::StringPrintf( - "Incorrect filtering at %dms for slot %lu", entry.time_ms, + "Incorrect filtering at %dms for slot %zu", entry.time_ms, slot); return false; } -- cgit v1.1