From 70e0d2d604500f0f46ac07c68720d9caf6399963 Mon Sep 17 00:00:00 2001 From: spang Date: Fri, 27 Mar 2015 10:42:40 -0700 Subject: [PATCH] ozone: evdev: Unsquelch some real errors in release These are currently DLOG() but we really shouldn't be hiding them. Also use PLOG() when we know errno will be set. BUG=none TEST=build Review URL: https://codereview.chromium.org/1032233002 Cr-Commit-Position: refs/heads/master@{#322599} --- ui/events/ozone/evdev/event_device_info.cc | 9 ++++----- ui/events/ozone/evdev/touch_event_converter_evdev.cc | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ui/events/ozone/evdev/event_device_info.cc b/ui/events/ozone/evdev/event_device_info.cc index a289d786ed3b..f8fcd5f6561e 100644 --- a/ui/events/ozone/evdev/event_device_info.cc +++ b/ui/events/ozone/evdev/event_device_info.cc @@ -19,8 +19,7 @@ namespace { bool GetEventBits(int fd, unsigned int type, void* buf, unsigned int size) { if (ioctl(fd, EVIOCGBIT(type, size), buf) < 0) { - DLOG(ERROR) << "failed EVIOCGBIT(" << type << ", " << size << ") on fd " - << fd; + PLOG(ERROR) << "EVIOCGBIT(" << type << ", " << size << ") on fd " << fd; return false; } @@ -29,7 +28,7 @@ bool GetEventBits(int fd, unsigned int type, void* buf, unsigned int size) { bool GetPropBits(int fd, void* buf, unsigned int size) { if (ioctl(fd, EVIOCGPROP(size), buf) < 0) { - DLOG(ERROR) << "failed EVIOCGPROP(" << size << ") on fd " << fd; + PLOG(ERROR) << "EVIOCGPROP(" << size << ") on fd " << fd; return false; } @@ -38,7 +37,7 @@ bool GetPropBits(int fd, void* buf, unsigned int size) { bool GetAbsInfo(int fd, int code, struct input_absinfo* absinfo) { if (ioctl(fd, EVIOCGABS(code), absinfo)) { - DLOG(ERROR) << "failed EVIOCGABS(" << code << ") on fd " << fd; + PLOG(ERROR) << "EVIOCGABS(" << code << ") on fd " << fd; return false; } return true; @@ -55,7 +54,7 @@ bool GetSlotValues(int fd, int32_t* request, unsigned int size) { size_t data_size = size * sizeof(*request); if (ioctl(fd, EVIOCGMTSLOTS(data_size), request) < 0) { - DLOG(ERROR) << "failed EVIOCGMTSLOTS(" << request[0] << ") on fd " << fd; + PLOG(ERROR) << "EVIOCGMTSLOTS(" << request[0] << ") on fd " << fd; return false; } diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.cc b/ui/events/ozone/evdev/touch_event_converter_evdev.cc index 221e6bf72cca..7a73ac57ad5b 100644 --- a/ui/events/ozone/evdev/touch_event_converter_evdev.cc +++ b/ui/events/ozone/evdev/touch_event_converter_evdev.cc @@ -47,13 +47,13 @@ void GetTouchCalibration(TouchCalibration* cal) { switches::kTouchCalibration), ",", &parts) >= 4) { if (!base::StringToInt(parts[0], &cal->bezel_left)) - DLOG(ERROR) << "Incorrect left border calibration value passed."; + LOG(ERROR) << "Incorrect left border calibration value passed."; if (!base::StringToInt(parts[1], &cal->bezel_right)) - DLOG(ERROR) << "Incorrect right border calibration value passed."; + LOG(ERROR) << "Incorrect right border calibration value passed."; if (!base::StringToInt(parts[2], &cal->bezel_top)) - DLOG(ERROR) << "Incorrect top border calibration value passed."; + LOG(ERROR) << "Incorrect top border calibration value passed."; if (!base::StringToInt(parts[3], &cal->bezel_bottom)) - DLOG(ERROR) << "Incorrect bottom border calibration value passed."; + LOG(ERROR) << "Incorrect bottom border calibration value passed."; } } -- 2.11.4.GIT