chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap: introduce hash_ops to make struct Hashmap smaller
[elogind.git]
/
src
/
login
/
logind-session-device.c
diff --git
a/src/login/logind-session-device.c
b/src/login/logind-session-device.c
index b2ef8ccc999e6f01925697af22b563878ee76c0b..932abb82f960655564b714b75c209129fced93fc 100644
(file)
--- a/
src/login/logind-session-device.c
+++ b/
src/login/logind-session-device.c
@@
-62,10
+62,10
@@
static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotificati
return -ENOMEM;
r = sd_bus_message_new_signal(
return -ENOMEM;
r = sd_bus_message_new_signal(
- sd->session->manager->bus, path,
+ sd->session->manager->bus,
+ &m, path,
"org.freedesktop.login1.Session",
"org.freedesktop.login1.Session",
- (type == SESSION_DEVICE_RESUME) ? "ResumeDevice" : "PauseDevice",
- &m);
+ (type == SESSION_DEVICE_RESUME) ? "ResumeDevice" : "PauseDevice");
if (!m)
return r;
if (!m)
return r;
@@
-162,7
+162,7
@@
static int session_device_open(SessionDevice *sd, bool active) {
* state. */
r = sd_drmsetmaster(fd);
if (r < 0) {
* state. */
r = sd_drmsetmaster(fd);
if (r < 0) {
- close(fd);
+ close
_nointr
(fd);
return r;
}
} else {
return r;
}
} else {
@@
-209,7
+209,7
@@
static int session_device_start(SessionDevice *sd) {
r = session_device_open(sd, true);
if (r < 0)
return r;
r = session_device_open(sd, true);
if (r < 0)
return r;
- close_nointr
_nofail
(sd->fd);
+ close_nointr(sd->fd);
sd->fd = r;
break;
case DEVICE_TYPE_UNKNOWN:
sd->fd = r;
break;
case DEVICE_TYPE_UNKNOWN:
@@
-407,7
+407,7
@@
void session_device_free(SessionDevice *sd) {
session_device_stop(sd);
session_device_notify(sd, SESSION_DEVICE_RELEASE);
session_device_stop(sd);
session_device_notify(sd, SESSION_DEVICE_RELEASE);
- close_nointr
_nofail
(sd->fd);
+ close_nointr(sd->fd);
LIST_REMOVE(sd_by_device, sd->device->session_devices, sd);
LIST_REMOVE(sd_by_device, sd->device->session_devices, sd);