chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix service file to match installed elogind binary location
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-kernel.c
diff --git
a/src/libelogind/sd-bus/bus-kernel.c
b/src/libelogind/sd-bus/bus-kernel.c
index 5db011b710cd9f2de18f92c3166663297038dfae..84a8b77669828714802d03418c2fbce5420cedc7 100644
(file)
--- a/
src/libelogind/sd-bus/bus-kernel.c
+++ b/
src/libelogind/sd-bus/bus-kernel.c
@@
-42,7
+42,7
@@
#include "capability-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "capability-util.h"
#include "fd-util.h"
#include "fileio.h"
-#include "format
s
-util.h"
+#include "format-util.h"
#include "memfd-util.h"
#include "parse-util.h"
#include "stdio-util.h"
#include "memfd-util.h"
#include "parse-util.h"
#include "stdio-util.h"
@@
-51,6
+51,8
@@
#include "user-util.h"
#include "util.h"
#include "user-util.h"
#include "util.h"
+#pragma GCC diagnostic ignored "-Wformat"
+
#define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
int bus_kernel_parse_unique_name(const char *s, uint64_t *id) {
#define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
int bus_kernel_parse_unique_name(const char *s, uint64_t *id) {
@@
-848,8
+850,7
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
if (k->src_id == KDBUS_SRC_ID_KERNEL)
bus_message_set_sender_driver(bus, m);
else {
if (k->src_id == KDBUS_SRC_ID_KERNEL)
bus_message_set_sender_driver(bus, m);
else {
- xsprintf(m->sender_buffer, ":1.%llu",
- (unsigned long long)k->src_id);
+ xsprintf(m->sender_buffer, ":1.%llu", k->src_id);
m->sender = m->creds.unique_name = m->sender_buffer;
}
m->sender = m->creds.unique_name = m->sender_buffer;
}
@@
-860,8
+861,7
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
else if (k->dst_id == KDBUS_DST_ID_NAME)
m->destination = bus->unique_name; /* fill in unique name if the well-known name is missing */
else {
else if (k->dst_id == KDBUS_DST_ID_NAME)
m->destination = bus->unique_name; /* fill in unique name if the well-known name is missing */
else {
- xsprintf(m->destination_buffer, ":1.%llu",
- (unsigned long long)k->dst_id);
+ xsprintf(m->destination_buffer, ":1.%llu", k->dst_id);
m->destination = m->destination_buffer;
}
m->destination = m->destination_buffer;
}
@@
-1035,7
+1035,7
@@
int bus_kernel_take_fd(sd_bus *b) {
b->bloom_size = (size_t) bloom->size;
b->bloom_n_hash = (unsigned) bloom->n_hash;
b->bloom_size = (size_t) bloom->size;
b->bloom_n_hash = (unsigned) bloom->n_hash;
- if (asprintf(&b->unique_name, ":1.%llu",
(unsigned long long)
hello->id) < 0) {
+ if (asprintf(&b->unique_name, ":1.%llu", hello->id) < 0) {
r = -ENOMEM;
goto fail;
}
r = -ENOMEM;
goto fail;
}
@@
-1207,7
+1207,7
@@
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call
return r;
}
} else {
return r;
}
} else {
- log_debug("Ignoring message with unknown payload type %llu.",
(unsigned long long)
k->payload_type);
+ log_debug("Ignoring message with unknown payload type %llu.", k->payload_type);
close_kdbus_msg(bus, k);
}
}
close_kdbus_msg(bus, k);
}
}
@@
-1268,7
+1268,7
@@
static int translate_name_change(
if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR)))
old_owner[0] = 0;
else
if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR)))
old_owner[0] = 0;
else
- sprintf(old_owner, ":1.%llu",
(unsigned long long)
d->name_change.old_id.id);
+ sprintf(old_owner, ":1.%llu", d->name_change.old_id.id);
if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) {
if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) {
@@
-1277,7
+1277,7
@@
static int translate_name_change(
new_owner[0] = 0;
} else
new_owner[0] = 0;
} else
- sprintf(new_owner, ":1.%llu",
(unsigned long long)
d->name_change.new_id.id);
+ sprintf(new_owner, ":1.%llu", d->name_change.new_id.id);
return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner, ts);
}
return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner, ts);
}
@@
-1419,7
+1419,7
@@
int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority) {
r = bus_kernel_translate_message(bus, k);
close_kdbus_msg(bus, k);
} else {
r = bus_kernel_translate_message(bus, k);
close_kdbus_msg(bus, k);
} else {
- log_debug("Ignoring message with unknown payload type %llu.",
(unsigned long long)
k->payload_type);
+ log_debug("Ignoring message with unknown payload type %llu.", k->payload_type);
r = 0;
close_kdbus_msg(bus, k);
}
r = 0;
close_kdbus_msg(bus, k);
}
@@
-1585,7
+1585,6
@@
uint64_t attach_flags_to_kdbus(uint64_t mask) {
return m;
}
return m;
}
-#if 0 /// UNNEEDED by elogind
int bus_kernel_create_bus(const char *name, bool world, char **s) {
struct kdbus_cmd *make;
struct kdbus_item *n;
int bus_kernel_create_bus(const char *name, bool world, char **s) {
struct kdbus_cmd *make;
struct kdbus_item *n;
@@
-1650,7
+1649,7
@@
int bus_kernel_create_bus(const char *name, bool world, char **s) {
if (s) {
char *p;
if (s) {
char *p;
- p = strjoin("/sys/fs/kdbus/", n->str, "/bus"
, NULL
);
+ p = strjoin("/sys/fs/kdbus/", n->str, "/bus");
if (!p) {
safe_close(fd);
return -ENOMEM;
if (!p) {
safe_close(fd);
return -ENOMEM;
@@
-1661,7
+1660,6
@@
int bus_kernel_create_bus(const char *name, bool world, char **s) {
return fd;
}
return fd;
}
-#endif // 0
int bus_kernel_open_bus_fd(const char *bus, char **path) {
char *p;
int bus_kernel_open_bus_fd(const char *bus, char **path) {
char *p;