chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Apply more cosmetic changes found in upstream.
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-message.h
diff --git
a/src/libelogind/sd-bus/bus-message.h
b/src/libelogind/sd-bus/bus-message.h
index 088d5b110936b77bdb6b0ca57b29eb27d9aab5af..8aca18381b53b59472058dd907c7746d0fb8337a 100644
(file)
--- a/
src/libelogind/sd-bus/bus-message.h
+++ b/
src/libelogind/sd-bus/bus-message.h
@@
-21,15
+21,16
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdbool.h>
#include <byteswap.h>
#include <byteswap.h>
+#include <stdbool.h>
#include <sys/socket.h>
#include <sys/socket.h>
-#include "macro.h"
#include "sd-bus.h"
#include "sd-bus.h"
-#include "time-util.h"
+
#include "bus-creds.h"
#include "bus-protocol.h"
#include "bus-creds.h"
#include "bus-protocol.h"
+#include "macro.h"
+#include "time-util.h"
struct bus_container {
char enclosing;
struct bus_container {
char enclosing;
@@
-193,7
+194,7
@@
static inline bool BUS_MESSAGE_IS_GVARIANT(sd_bus_message *m) {
}
int bus_message_seal(sd_bus_message *m, uint64_t serial, usec_t timeout);
}
int bus_message_seal(sd_bus_message *m, uint64_t serial, usec_t timeout);
-int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz);
+
// UNNEEDED
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(
int bus_message_read_strv_extend(sd_bus_message *m, char ***l);
int bus_message_from_header(
@@
-218,7
+219,8
@@
int bus_message_from_malloc(
const char *label,
sd_bus_message **ret);
const char *label,
sd_bus_message **ret);
-int bus_message_get_arg(sd_bus_message *m, unsigned i, const char **str, char ***strv);
+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_append_ap(sd_bus_message *m, const char *types, va_list ap);
int bus_message_append_ap(sd_bus_message *m, const char *types, va_list ap);
@@
-238,7
+240,7
@@
int bus_message_new_synthetic_error(sd_bus *bus, uint64_t serial, const sd_bus_e
int bus_message_remarshal(sd_bus *bus, sd_bus_message **m);
int bus_message_remarshal(sd_bus *bus, sd_bus_message **m);
-int bus_message_append_sender(sd_bus_message *m, const char *sender);
+
// UNNEEDED
int bus_message_append_sender(sd_bus_message *m, const char *sender);
void bus_message_set_sender_driver(sd_bus *bus, sd_bus_message *m);
void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m);
void bus_message_set_sender_driver(sd_bus *bus, sd_bus_message *m);
void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m);