chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: add bus API for configuring per-link DNS settings
[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 829e37e4a1ff8e02e18a0c8b433b80d16594387c..9cde445460f43b1098ca2fb9f7f740d4ec69368f 100644
(file)
--- a/
src/libelogind/sd-bus/bus-convenience.c
+++ b/
src/libelogind/sd-bus/bus-convenience.c
@@
-33,7
+33,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);
@@
-59,8
+59,7
@@
_public_ int sd_bus_emit_signal(
return sd_bus_send(bus, m, NULL);
}
return sd_bus_send(bus, m, NULL);
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_call_method_async(
sd_bus *bus,
sd_bus_slot **slot,
_public_ int sd_bus_call_method_async(
sd_bus *bus,
sd_bus_slot **slot,
@@
-72,7
+71,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);
@@
-109,7
+108,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);
@@
-144,7
+143,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);
@@
-180,7
+179,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);
@@
-209,7
+208,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);
@@
-236,7
+235,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);
@@
-258,15
+257,14
@@
_public_ int sd_bus_reply_method_errno(
return sd_bus_reply_method_error(call, &berror);
}
return sd_bus_reply_method_error(call, &berror);
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_reply_method_errnof(
sd_bus_message *call,
int error,
const char *format,
...) {
_public_ int sd_bus_reply_method_errnof(
sd_bus_message *call,
int error,
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);
@@
-331,8
+329,7
@@
fail:
return sd_bus_error_set_errno(error, r);
}
return sd_bus_error_set_errno(error, r);
}
-/// UNNEEDED by elogind
-#if 0
+#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,
@@
-342,7
+339,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);
@@
-385,7
+382,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;
@@
-426,8
+423,7
@@
fail:
return sd_bus_error_set_errno(error, r);
}
return sd_bus_error_set_errno(error, r);
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_property_strv(
sd_bus *bus,
const char *destination,
_public_ int sd_bus_get_property_strv(
sd_bus *bus,
const char *destination,
@@
-437,7
+433,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);
@@
-478,7
+474,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;
@@
-567,7
+563,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;