chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
bus-driverd
/
bus-driverd.c
diff --git
a/src/bus-driverd/bus-driverd.c
b/src/bus-driverd/bus-driverd.c
index b97206600b461a92c925e58a4a9f9c36a4d78a57..3284d625340dc8897082d78b73cfe53d991dffcc 100644
(file)
--- a/
src/bus-driverd/bus-driverd.c
+++ b/
src/bus-driverd/bus-driverd.c
@@
-29,7
+29,6
@@
#include <sys/un.h>
#include <sys/timex.h>
#include <sys/utsname.h>
#include <sys/un.h>
#include <sys/timex.h>
#include <sys/utsname.h>
-#include <unistd.h>
#include "kdbus.h"
#include "sd-bus.h"
#include "kdbus.h"
#include "sd-bus.h"
@@
-563,11
+562,9
@@
static int driver_list_queued_owners(sd_bus *bus, sd_bus_message *m, void *userd
if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0)
return -ENOMEM;
if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0)
return -ENOMEM;
- r = strv_push(&owners, n);
- if (r < 0) {
- free(n);
- return -ENOMEM;
- }
+ r = strv_consume(&owners, n);
+ if (r < 0)
+ return r;
}
r = ioctl(bus->input_fd, KDBUS_CMD_FREE, &cmd.offset);
}
r = ioctl(bus->input_fd, KDBUS_CMD_FREE, &cmd.offset);
@@
-777,11
+774,11
@@
static int driver_update_environment(sd_bus*bus, sd_bus_message *m, void *userda
r = sd_bus_message_new_method_call(
bus,
r = sd_bus_message_new_method_call(
bus,
+ &msg,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
- "SetEnvironment",
- &msg);
+ "SetEnvironment");
if (r < 0)
return r;
if (r < 0)
return r;