chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove repeated includes
[elogind.git]
/
src
/
bus-proxyd
/
bus-proxyd.c
diff --git
a/src/bus-proxyd/bus-proxyd.c
b/src/bus-proxyd/bus-proxyd.c
index d8d989b9b080add82f57434c603a87f532ba35bf..5d58cd2af4d33b44a0f208918898e03a7a89b3e3 100644
(file)
--- a/
src/bus-proxyd/bus-proxyd.c
+++ b/
src/bus-proxyd/bus-proxyd.c
@@
-40,7
+40,6
@@
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-util.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-util.h"
-#include "bus-internal.h"
#include "build.h"
#include "strv.h"
#include "def.h"
#include "build.h"
#include "strv.h"
#include "def.h"
@@
-239,7
+238,7
@@
static int rename_service(sd_bus *a, sd_bus *b) {
pid, p,
uid, name,
a->unique_name);
pid, p,
uid, name,
a->unique_name);
- ;
+
return 0;
}
return 0;
}
@@
-373,6
+372,8
@@
static int synthetic_reply_method_error(sd_bus_message *call, const sd_bus_error
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
+ assert(call);
+
if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
return 0;
if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
return 0;
@@
-387,6
+388,8
@@
static int synthetic_reply_method_errno(sd_bus_message *call, int error, const s
_cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
_cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+ assert(call);
+
if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
return 0;
if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
return 0;
@@
-402,6
+405,8
@@
static int synthetic_reply_method_return(sd_bus_message *call, const char *types
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
+ assert(call);
+
if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
return 0;
if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
return 0;
@@
-426,6
+431,8
@@
static int synthetic_reply_return_strv(sd_bus_message *call, char **l) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
+ assert(call);
+
r = sd_bus_message_new_method_return(call, &m);
if (r < 0)
return synthetic_reply_method_errno(call, r, NULL);
r = sd_bus_message_new_method_return(call, &m);
if (r < 0)
return synthetic_reply_method_errno(call, r, NULL);
@@
-743,12
+750,15
@@
static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
name_list = (struct kdbus_name_list *) ((uint8_t *) a->kdbus_buffer + cmd.offset);
KDBUS_ITEM_FOREACH(name, name_list, names) {
name_list = (struct kdbus_name_list *) ((uint8_t *) a->kdbus_buffer + cmd.offset);
KDBUS_ITEM_FOREACH(name, name_list, names) {
+ const char *entry_name = NULL;
+ struct kdbus_item *item;
char *n;
char *n;
- if (name->size <= sizeof(*name))
- continue;
+ KDBUS_ITEM_FOREACH(item, name, items)
+ if (item->type == KDBUS_ITEM_NAME)
+ entry_name = item->str;
- if (!streq
(name->
name, arg0))
+ if (!streq
_ptr(entry_
name, arg0))
continue;
if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) {
continue;
if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) {
@@
-1474,6
+1484,10
@@
int main(int argc, char *argv[]) {
}
finish:
}
finish:
+ sd_notify(false,
+ "STOPPING=1\n"
+ "STATUS=Shutting down.");
+
policy_free(&policy);
strv_free(arg_configuration);
free(arg_address);
policy_free(&policy);
strv_free(arg_configuration);
free(arg_address);