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-message.c
diff --git
a/src/libelogind/sd-bus/bus-message.c
b/src/libelogind/sd-bus/bus-message.c
index d4f59117b6730b5d3ef8a53f0a276b795413b7dd..a9853e326558f8b50af6c99175255ca8d4cb4f6f 100644
(file)
--- a/
src/libelogind/sd-bus/bus-message.c
+++ b/
src/libelogind/sd-bus/bus-message.c
@@
-181,7
+181,7
@@
static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz, b
if (!np)
goto poison;
} else {
if (!np)
goto poison;
} else {
- /* Initially, the header is allocated as part of
of
+ /* Initially, the header is allocated as part of
* the sd_bus_message itself, let's replace it by
* dynamic data */
* the sd_bus_message itself, let's replace it by
* dynamic data */
@@
-829,7
+829,6
@@
_public_ int sd_bus_message_new_method_errno(
return sd_bus_message_new_method_error(call, m, &berror);
}
return sd_bus_message_new_method_error(call, m, &berror);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_new_method_errnof(
sd_bus_message *call,
sd_bus_message **m,
_public_ int sd_bus_message_new_method_errnof(
sd_bus_message *call,
sd_bus_message **m,
@@
-846,7
+845,6
@@
_public_ int sd_bus_message_new_method_errnof(
return sd_bus_message_new_method_error(call, m, &berror);
}
return sd_bus_message_new_method_error(call, m, &berror);
}
-#endif // 0
void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m) {
assert(bus);
void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m) {
assert(bus);
@@
-944,7
+942,6
@@
_public_ sd_bus_message* sd_bus_message_unref(sd_bus_message *m) {
return NULL;
}
return NULL;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type) {
assert_return(m, -EINVAL);
assert_return(type, -EINVAL);
_public_ int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type) {
assert_return(m, -EINVAL);
assert_return(type, -EINVAL);
@@
-990,7
+987,6
@@
_public_ int sd_bus_message_get_auto_start(sd_bus_message *m) {
return !(m->header->flags & BUS_MESSAGE_NO_AUTO_START);
}
return !(m->header->flags & BUS_MESSAGE_NO_AUTO_START);
}
-#endif // 0
_public_ int sd_bus_message_get_allow_interactive_authorization(sd_bus_message *m) {
assert_return(m, -EINVAL);
_public_ int sd_bus_message_get_allow_interactive_authorization(sd_bus_message *m) {
assert_return(m, -EINVAL);
@@
-1038,7
+1034,6
@@
_public_ const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m) {
return &m->error;
}
return &m->error;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_get_monotonic_usec(sd_bus_message *m, uint64_t *usec) {
assert_return(m, -EINVAL);
assert_return(usec, -EINVAL);
_public_ int sd_bus_message_get_monotonic_usec(sd_bus_message *m, uint64_t *usec) {
assert_return(m, -EINVAL);
assert_return(usec, -EINVAL);
@@
-1071,7
+1066,6
@@
_public_ int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t *seqnum) {
*seqnum = m->seqnum;
return 0;
}
*seqnum = m->seqnum;
return 0;
}
-#endif // 0
_public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) {
assert_return(m, NULL);
_public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) {
assert_return(m, NULL);
@@
-1082,7
+1076,6
@@
_public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) {
return &m->creds;
}
return &m->creds;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_is_signal(
sd_bus_message *m,
const char *interface,
_public_ int sd_bus_message_is_signal(
sd_bus_message *m,
const char *interface,
@@
-1101,7
+1094,6
@@
_public_ int sd_bus_message_is_signal(
return 1;
}
return 1;
}
-#endif // 0
_public_ int sd_bus_message_is_method_call(
sd_bus_message *m,
_public_ int sd_bus_message_is_method_call(
sd_bus_message *m,
@@
-1134,7
+1126,6
@@
_public_ int sd_bus_message_is_method_error(sd_bus_message *m, const char *name)
return 1;
}
return 1;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_set_expect_reply(sd_bus_message *m, int b) {
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
_public_ int sd_bus_message_set_expect_reply(sd_bus_message *m, int b) {
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
@@
-1162,7
+1153,6
@@
_public_ int sd_bus_message_set_allow_interactive_authorization(sd_bus_message *
return 0;
}
return 0;
}
-#endif // 0
static struct bus_container *message_get_container(sd_bus_message *m) {
assert(m);
static struct bus_container *message_get_container(sd_bus_message *m) {
assert(m);
@@
-1657,7
+1647,6
@@
_public_ int sd_bus_message_append_basic(sd_bus_message *m, char type, const voi
return message_append_basic(m, type, p, NULL);
}
return message_append_basic(m, type, p, NULL);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_append_string_space(
sd_bus_message *m,
size_t size,
_public_ int sd_bus_message_append_string_space(
sd_bus_message *m,
size_t size,
@@
-1748,7
+1737,6
@@
_public_ int sd_bus_message_append_string_iovec(
return 0;
}
return 0;
}
-#endif // 0
static int bus_message_open_array(
sd_bus_message *m,
static int bus_message_open_array(
sd_bus_message *m,
@@
-2353,7
+2341,7
@@
static int type_stack_pop(TypeStack *stack, unsigned max, unsigned *i, const cha
return 1;
}
return 1;
}
-
int bus_message_append_ap
(
+
_public_ int sd_bus_message_appendv
(
sd_bus_message *m,
const char *types,
va_list ap) {
sd_bus_message *m,
const char *types,
va_list ap) {
@@
-2363,10
+2351,10
@@
int bus_message_append_ap(
unsigned stack_ptr = 0;
int r;
unsigned stack_ptr = 0;
int r;
- assert
(m
);
-
- if (!types)
-
return 0
;
+ assert
_return(m, -EINVAL
);
+ assert_return(types, -EINVAL);
+ assert_return(!m->sealed, -EPERM);
+
assert_return(!m->poisoned, -ESTALE)
;
n_array = (unsigned) -1;
n_struct = strlen(types);
n_array = (unsigned) -1;
n_struct = strlen(types);
@@
-2567,13
+2555,12
@@
_public_ int sd_bus_message_append(sd_bus_message *m, const char *types, ...) {
assert_return(!m->poisoned, -ESTALE);
va_start(ap, types);
assert_return(!m->poisoned, -ESTALE);
va_start(ap, types);
- r =
bus_message_append_ap
(m, types, ap);
+ r =
sd_bus_message_appendv
(m, types, ap);
va_end(ap);
return r;
}
va_end(ap);
return r;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_append_array_space(
sd_bus_message *m,
char type,
_public_ int sd_bus_message_append_array_space(
sd_bus_message *m,
char type,
@@
-2850,7
+2837,6
@@
_public_ int sd_bus_message_append_string_memfd(
return 0;
}
return 0;
}
-#endif // 0
_public_ int sd_bus_message_append_strv(sd_bus_message *m, char **l) {
char **i;
_public_ int sd_bus_message_append_strv(sd_bus_message *m, char **l) {
char **i;
@@
-2879,7
+2865,7
@@
static int bus_message_close_header(sd_bus_message *m) {
/* The actual user data is finished now, we just complete the
variant and struct now (at least on gvariant). Remember
/* The actual user data is finished now, we just complete the
variant and struct now (at least on gvariant). Remember
- this position, so that during parsing we know where to
to
+ this position, so that during parsing we know where to
put the outer container end. */
m->user_body_size = m->body_size;
put the outer container end. */
m->user_body_size = m->body_size;
@@
-3151,7
+3137,6
@@
static bool message_end_of_array(sd_bus_message *m, size_t index) {
}
}
}
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_at_end(sd_bus_message *m, int complete) {
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
_public_ int sd_bus_message_at_end(sd_bus_message *m, int complete) {
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
@@
-3167,7
+3152,6
@@
_public_ int sd_bus_message_at_end(sd_bus_message *m, int complete) {
return false;
}
return false;
}
-#endif // 0
static struct bus_body_part* find_part(sd_bus_message *m, size_t index, size_t sz, void **p) {
struct bus_body_part *part;
static struct bus_body_part* find_part(sd_bus_message *m, size_t index, size_t sz, void **p) {
struct bus_body_part *part;
@@
-5723,7
+5707,6
@@
_public_ const char* sd_bus_message_get_signature(sd_bus_message *m, int complet
return strempty(c->signature);
}
return strempty(c->signature);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_is_empty(sd_bus_message *m) {
assert_return(m, -EINVAL);
_public_ int sd_bus_message_is_empty(sd_bus_message *m) {
assert_return(m, -EINVAL);
@@
-5735,7
+5718,6
@@
_public_ int sd_bus_message_has_signature(sd_bus_message *m, const char *signatu
return streq(strempty(m->root_container.signature), strempty(signature));
}
return streq(strempty(m->root_container.signature), strempty(signature));
}
-#endif // 0
_public_ int sd_bus_message_copy(sd_bus_message *m, sd_bus_message *source, int all) {
bool done_something = false;
_public_ int sd_bus_message_copy(sd_bus_message *m, sd_bus_message *source, int all) {
bool done_something = false;
@@
-5816,7
+5798,6
@@
_public_ int sd_bus_message_copy(sd_bus_message *m, sd_bus_message *source, int
return done_something;
}
return done_something;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents) {
const char *c;
char t;
_public_ int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents) {
const char *c;
char t;
@@
-5841,7
+5822,6
@@
_public_ int sd_bus_message_verify_type(sd_bus_message *m, char type, const char
return 1;
}
return 1;
}
-#endif // 0
_public_ sd_bus *sd_bus_message_get_bus(sd_bus_message *m) {
assert_return(m, NULL);
_public_ sd_bus *sd_bus_message_get_bus(sd_bus_message *m) {
assert_return(m, NULL);
@@
-5944,6
+5924,7
@@
int bus_message_append_sender(sd_bus_message *m, const char *sender) {
return message_append_field_string(m, BUS_MESSAGE_HEADER_SENDER, SD_BUS_TYPE_STRING, sender, &m->sender);
}
return message_append_field_string(m, BUS_MESSAGE_HEADER_SENDER, SD_BUS_TYPE_STRING, sender, &m->sender);
}
+#endif // 0
_public_ int sd_bus_message_get_priority(sd_bus_message *m, int64_t *priority) {
assert_return(m, -EINVAL);
_public_ int sd_bus_message_get_priority(sd_bus_message *m, int64_t *priority) {
assert_return(m, -EINVAL);
@@
-5960,4
+5941,3
@@
_public_ int sd_bus_message_set_priority(sd_bus_message *m, int64_t priority) {
m->priority = priority;
return 0;
}
m->priority = priority;
return 0;
}
-#endif // 0