sd-bus: make several functions static

And drop 'bus_' prefix from them.
This commit is contained in:
Yu Watanabe
2022-06-01 03:41:15 +09:00
parent 590a738562
commit 75c85c3b25
2 changed files with 6 additions and 24 deletions
+6 -5
View File
@@ -22,6 +22,7 @@
#include "utf8.h"
static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
static int message_parse_fields(sd_bus_message *m);
static void *adjust_pointer(const void *p, void *old_base, size_t sz, void *new_base) {
@@ -413,7 +414,7 @@ static int message_append_reply_cookie(sd_bus_message *m, uint64_t cookie) {
}
}
int bus_message_from_header(
static int message_from_header(
sd_bus *bus,
void *header,
size_t header_accessible,
@@ -543,7 +544,7 @@ int bus_message_from_malloc(
size_t sz;
int r;
r = bus_message_from_header(
r = message_from_header(
bus,
buffer, length, /* in this case the initial bytes and the final bytes are the same */
buffer, length,
@@ -567,7 +568,7 @@ int bus_message_from_malloc(
m->iovec = m->iovec_fixed;
m->iovec[0] = IOVEC_MAKE(buffer, length);
r = bus_message_parse_fields(m);
r = message_parse_fields(m);
if (r < 0)
return r;
@@ -1195,7 +1196,7 @@ _public_ int sd_bus_message_set_allow_interactive_authorization(sd_bus_message *
return 0;
}
struct bus_body_part *message_append_part(sd_bus_message *m) {
static struct bus_body_part *message_append_part(sd_bus_message *m) {
struct bus_body_part *part;
assert(m);
@@ -5162,7 +5163,7 @@ static int message_skip_fields(
}
}
int bus_message_parse_fields(sd_bus_message *m) {
static int message_parse_fields(sd_bus_message *m) {
size_t ri;
int r;
uint32_t unix_fds = 0;
-19
View File
@@ -178,19 +178,6 @@ static inline bool BUS_MESSAGE_IS_GVARIANT(sd_bus_message *m) {
int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz);
int bus_message_read_strv_extend(sd_bus_message *m, char ***l);
int bus_message_from_header(
sd_bus *bus,
void *header,
size_t header_accessible,
void *footer,
size_t footer_accessible,
size_t message_size,
int *fds,
size_t n_fds,
const char *label,
size_t extra,
sd_bus_message **ret);
int bus_message_from_malloc(
sd_bus *bus,
void *buffer,
@@ -203,18 +190,12 @@ int bus_message_from_malloc(
int bus_message_get_arg(sd_bus_message *m, unsigned i, const char **str);
int bus_message_get_arg_strv(sd_bus_message *m, unsigned i, char ***strv);
int bus_message_parse_fields(sd_bus_message *m);
struct bus_body_part *message_append_part(sd_bus_message *m);
#define MESSAGE_FOREACH_PART(part, i, m) \
for ((i) = 0, (part) = &(m)->body; (i) < (m)->n_body_parts; (i)++, (part) = (part)->next)
int bus_body_part_map(struct bus_body_part *part);
void bus_body_part_unmap(struct bus_body_part *part);
int bus_message_to_errno(sd_bus_message *m);
int bus_message_new_synthetic_error(sd_bus *bus, uint64_t serial, const sd_bus_error *e, sd_bus_message **m);
int bus_message_remarshal(sd_bus *bus, sd_bus_message **m);