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 v234: Update root build files to upstream.
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-convenience.c
diff --git
a/src/libelogind/sd-bus/bus-convenience.c
b/src/libelogind/sd-bus/bus-convenience.c
index 3c06316fbac8e5144c3111798e43b1e5d6e37536..1eb7264621ac2db84f22c55b116f817299a0c494 100644
(file)
--- a/
src/libelogind/sd-bus/bus-convenience.c
+++ b/
src/libelogind/sd-bus/bus-convenience.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-33,7
+31,7
@@
_public_ int sd_bus_emit_signal(
const char *member,
const char *types, ...) {
const char *member,
const char *types, ...) {
- _cleanup_
bus_message_unref_
sd_bus_message *m = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *m = NULL;
int r;
assert_return(bus, -EINVAL);
int r;
assert_return(bus, -EINVAL);
@@
-50,7
+48,7
@@
_public_ int sd_bus_emit_signal(
va_list ap;
va_start(ap, types);
va_list ap;
va_start(ap, types);
- r =
bus_message_append_ap
(m, types, ap);
+ r =
sd_bus_message_appendv
(m, types, ap);
va_end(ap);
if (r < 0)
return r;
va_end(ap);
if (r < 0)
return r;
@@
-71,7
+69,7
@@
_public_ int sd_bus_call_method_async(
void *userdata,
const char *types, ...) {
void *userdata,
const char *types, ...) {
- _cleanup_
bus_message_unref_
sd_bus_message *m = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *m = NULL;
int r;
assert_return(bus, -EINVAL);
int r;
assert_return(bus, -EINVAL);
@@
-88,7
+86,7
@@
_public_ int sd_bus_call_method_async(
va_list ap;
va_start(ap, types);
va_list ap;
va_start(ap, types);
- r =
bus_message_append_ap
(m, types, ap);
+ r =
sd_bus_message_appendv
(m, types, ap);
va_end(ap);
if (r < 0)
return r;
va_end(ap);
if (r < 0)
return r;
@@
-108,7
+106,7
@@
_public_ int sd_bus_call_method(
sd_bus_message **reply,
const char *types, ...) {
sd_bus_message **reply,
const char *types, ...) {
- _cleanup_
bus_message_unref_
sd_bus_message *m = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *m = NULL;
int r;
bus_assert_return(bus, -EINVAL, error);
int r;
bus_assert_return(bus, -EINVAL, error);
@@
-127,7
+125,7
@@
_public_ int sd_bus_call_method(
va_list ap;
va_start(ap, types);
va_list ap;
va_start(ap, types);
- r =
bus_message_append_ap
(m, types, ap);
+ r =
sd_bus_message_appendv
(m, types, ap);
va_end(ap);
if (r < 0)
goto fail;
va_end(ap);
if (r < 0)
goto fail;
@@
-143,7
+141,7
@@
_public_ int sd_bus_reply_method_return(
sd_bus_message *call,
const char *types, ...) {
sd_bus_message *call,
const char *types, ...) {
- _cleanup_
bus_message_unref_
sd_bus_message *m = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *m = NULL;
int r;
assert_return(call, -EINVAL);
int r;
assert_return(call, -EINVAL);
@@
-166,7
+164,7
@@
_public_ int sd_bus_reply_method_return(
va_list ap;
va_start(ap, types);
va_list ap;
va_start(ap, types);
- r =
bus_message_append_ap
(m, types, ap);
+ r =
sd_bus_message_appendv
(m, types, ap);
va_end(ap);
if (r < 0)
return r;
va_end(ap);
if (r < 0)
return r;
@@
-179,7
+177,7
@@
_public_ int sd_bus_reply_method_error(
sd_bus_message *call,
const sd_bus_error *e) {
sd_bus_message *call,
const sd_bus_error *e) {
- _cleanup_
bus_message_unref_
sd_bus_message *m = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *m = NULL;
int r;
assert_return(call, -EINVAL);
int r;
assert_return(call, -EINVAL);
@@
-208,7
+206,7
@@
_public_ int sd_bus_reply_method_errorf(
const char *format,
...) {
const char *format,
...) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
va_list ap;
assert_return(call, -EINVAL);
va_list ap;
assert_return(call, -EINVAL);
@@
-235,7
+233,7
@@
_public_ int sd_bus_reply_method_errno(
int error,
const sd_bus_error *p) {
int error,
const sd_bus_error *p) {
- _cleanup_
bus_error_free_
sd_bus_error berror = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error berror = SD_BUS_ERROR_NULL;
assert_return(call, -EINVAL);
assert_return(call->sealed, -EPERM);
assert_return(call, -EINVAL);
assert_return(call->sealed, -EPERM);
@@
-264,7
+262,7
@@
_public_ int sd_bus_reply_method_errnof(
const char *format,
...) {
const char *format,
...) {
- _cleanup_
bus_error_free_
sd_bus_error berror = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error berror = SD_BUS_ERROR_NULL;
va_list ap;
assert_return(call, -EINVAL);
va_list ap;
assert_return(call, -EINVAL);
@@
-329,7
+327,6
@@
fail:
return sd_bus_error_set_errno(error, r);
}
return sd_bus_error_set_errno(error, r);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_property_trivial(
sd_bus *bus,
const char *destination,
_public_ int sd_bus_get_property_trivial(
sd_bus *bus,
const char *destination,
@@
-339,7
+336,7
@@
_public_ int sd_bus_get_property_trivial(
sd_bus_error *error,
char type, void *ptr) {
sd_bus_error *error,
char type, void *ptr) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
int r;
bus_assert_return(bus, -EINVAL, error);
int r;
bus_assert_return(bus, -EINVAL, error);
@@
-371,7
+368,6
@@
_public_ int sd_bus_get_property_trivial(
fail:
return sd_bus_error_set_errno(error, r);
}
fail:
return sd_bus_error_set_errno(error, r);
}
-#endif // 0
_public_ int sd_bus_get_property_string(
sd_bus *bus,
_public_ int sd_bus_get_property_string(
sd_bus *bus,
@@
-382,7
+378,7
@@
_public_ int sd_bus_get_property_string(
sd_bus_error *error,
char **ret) {
sd_bus_error *error,
char **ret) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
const char *s;
char *n;
int r;
const char *s;
char *n;
int r;
@@
-433,7
+429,7
@@
_public_ int sd_bus_get_property_strv(
sd_bus_error *error,
char ***ret) {
sd_bus_error *error,
char ***ret) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
int r;
bus_assert_return(bus, -EINVAL, error);
int r;
bus_assert_return(bus, -EINVAL, error);
@@
-474,7
+470,7
@@
_public_ int sd_bus_set_property(
sd_bus_error *error,
const char *type, ...) {
sd_bus_error *error,
const char *type, ...) {
- _cleanup_
bus_message_unref_
sd_bus_message *m = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *m = NULL;
va_list ap;
int r;
va_list ap;
int r;
@@
-502,7
+498,7
@@
_public_ int sd_bus_set_property(
goto fail;
va_start(ap, type);
goto fail;
va_start(ap, type);
- r =
bus_message_append_ap
(m, type, ap);
+ r =
sd_bus_message_appendv
(m, type, ap);
va_end(ap);
if (r < 0)
goto fail;
va_end(ap);
if (r < 0)
goto fail;
@@
-563,7
+559,7
@@
_public_ int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_b
}
_public_ int sd_bus_query_sender_privilege(sd_bus_message *call, int capability) {
}
_public_ int sd_bus_query_sender_privilege(sd_bus_message *call, int capability) {
- _cleanup_
bus_creds_unref_
sd_bus_creds *creds = NULL;
+ _cleanup_
(sd_bus_creds_unrefp)
sd_bus_creds *creds = NULL;
uid_t our_uid;
bool know_caps = false;
int r;
uid_t our_uid;
bool know_caps = false;
int r;