| リビジョン | c77052eb208e293f5a9c97b41f470edee8e11c46 (tree) |
|---|---|
| 日時 | 2020-02-21 06:56:00 |
| 作者 | Peter Collingbourne <pcc@goog...> |
| コミッター | Peter Collingbourne |
drm_hwcomposer: Improve error messages.
- Don't negate errno before passing to strerror, at least on
- Fix another error message to print strerror(errno) instead of the
- Fix another error message to call strerror for consistency.
Signed-off-by: Peter Collingbourne <pcc@google.com>
drm/drmdevice.cpp (diff) drm/drmeventlistener.cpp (diff)| @@ -126,7 +126,7 @@ std::tuple<int, int> DrmDevice::Init(const char *path, int num_displays) { | ||
| 126 | 126 | /* TODO: Use drmOpenControl here instead */ |
| 127 | 127 | fd_.Set(open(path, O_RDWR)); |
| 128 | 128 | if (fd() < 0) { |
| 129 | - ALOGE("Failed to open dri- %s", strerror(-errno)); | |
| 129 | + ALOGE("Failed to open dri %s: %s", path, strerror(errno)); | |
| 130 | 130 | return std::make_tuple(-ENODEV, 0); |
| 131 | 131 | } |
| 132 | 132 |
| @@ -38,7 +38,7 @@ DrmEventListener::DrmEventListener(DrmDevice *drm) | ||
| 38 | 38 | int DrmEventListener::Init() { |
| 39 | 39 | uevent_fd_.Set(socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT)); |
| 40 | 40 | if (uevent_fd_.get() < 0) { |
| 41 | - ALOGE("Failed to open uevent socket %d", uevent_fd_.get()); | |
| 41 | + ALOGE("Failed to open uevent socket: %s", strerror(errno)); | |
| 42 | 42 | return uevent_fd_.get(); |
| 43 | 43 | } |
| 44 | 44 |
| @@ -50,7 +50,7 @@ int DrmEventListener::Init() { | ||
| 50 | 50 | |
| 51 | 51 | int ret = bind(uevent_fd_.get(), (struct sockaddr *)&addr, sizeof(addr)); |
| 52 | 52 | if (ret) { |
| 53 | - ALOGE("Failed to bind uevent socket %d", -errno); | |
| 53 | + ALOGE("Failed to bind uevent socket: %s", strerror(errno)); | |
| 54 | 54 | return -errno; |
| 55 | 55 | } |
| 56 | 56 |
Android-x86
Fork