summaryrefslogtreecommitdiffstats
path: root/media/midi
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-06-09 11:05:24 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-09 18:05:54 +0000
commit6ee6fd6efabf8b87324d0b233ea2332c4a0e1642 (patch)
tree42d916d8ab1f88a91cc10b79a8adb1a75da2cfaa /media/midi
parenta99b6c8af0c0fec47f1aa46b4b8598b3586a7a69 (diff)
downloadchromium_src-6ee6fd6efabf8b87324d0b233ea2332c4a0e1642.zip
chromium_src-6ee6fd6efabf8b87324d0b233ea2332c4a0e1642.tar.gz
chromium_src-6ee6fd6efabf8b87324d0b233ea2332c4a0e1642.tar.bz2
Move safe_strerror to posix directory and the base namespace.
Since this is a wrapper around a posix thing that doesn't fall under any other categories, the posix directory is probably the best place. Review URL: https://codereview.chromium.org/1160373004 Cr-Commit-Position: refs/heads/master@{#333524}
Diffstat (limited to 'media/midi')
-rw-r--r--media/midi/midi_manager_alsa.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc
index a6e35e9..677287f 100644
--- a/media/midi/midi_manager_alsa.cc
+++ b/media/midi/midi_manager_alsa.cc
@@ -14,7 +14,7 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/posix/eintr_wrapper.h"
-#include "base/safe_strerror_posix.h"
+#include "base/posix/safe_strerror.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
@@ -261,12 +261,13 @@ void MidiManagerAlsa::StartInitialization() {
udev_monitor_.get(), kUdevSubsystemSound, nullptr);
if (err != 0) {
VLOG(1) << "udev_monitor_add_match_subsystem fails: "
- << safe_strerror(-err);
+ << base::safe_strerror(-err);
return CompleteInitialization(MIDI_INITIALIZATION_ERROR);
}
err = device::udev_monitor_enable_receiving(udev_monitor_.get());
if (err != 0) {
- VLOG(1) << "udev_monitor_enable_receiving fails: " << safe_strerror(-err);
+ VLOG(1) << "udev_monitor_enable_receiving fails: "
+ << base::safe_strerror(-err);
return CompleteInitialization(MIDI_INITIALIZATION_ERROR);
}
@@ -874,7 +875,7 @@ void MidiManagerAlsa::EventLoop() {
int err = HANDLE_EINTR(poll(pfd, arraysize(pfd), -1));
if (err < 0) {
- VLOG(1) << "poll fails: " << safe_strerror(errno);
+ VLOG(1) << "poll fails: " << base::safe_strerror(errno);
loop_again = false;
} else {
if (pfd[0].revents & POLLIN) {
@@ -1268,13 +1269,14 @@ bool MidiManagerAlsa::EnumerateUdevCards() {
kUdevSubsystemSound);
if (err) {
VLOG(1) << "udev_enumerate_add_match_subsystem fails: "
- << safe_strerror(-err);
+ << base::safe_strerror(-err);
return false;
}
err = device::udev_enumerate_scan_devices(enumerate.get());
if (err) {
- VLOG(1) << "udev_enumerate_scan_devices fails: " << safe_strerror(-err);
+ VLOG(1) << "udev_enumerate_scan_devices fails: "
+ << base::safe_strerror(-err);
return false;
}