summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorspang <spang@chromium.org>2015-06-25 12:39:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-25 19:40:43 +0000
commitb3a8bb872deb32a0273e5761e16b0ecb2061ab64 (patch)
tree429ffe2ed75f17d224fffd96553005bfc7e31ae5 /ui
parenteddcece7a95d6f7a22dedb74ed2f1e48e669af99 (diff)
downloadchromium_src-b3a8bb872deb32a0273e5761e16b0ecb2061ab64.zip
chromium_src-b3a8bb872deb32a0273e5761e16b0ecb2061ab64.tar.gz
chromium_src-b3a8bb872deb32a0273e5761e16b0ecb2061ab64.tar.bz2
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}
Diffstat (limited to 'ui')
-rw-r--r--ui/events/ozone/evdev/event_device_test_util.cc2
-rw-r--r--ui/events/ozone/evdev/touch_noise/touch_noise_finder_unittest.cc2
2 files changed, 2 insertions, 2 deletions
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;
}