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-convenience.c
diff --git
a/src/libelogind/sd-bus/bus-convenience.c
b/src/libelogind/sd-bus/bus-convenience.c
index 829e37e4a1ff8e02e18a0c8b433b80d16594387c..04158cae4d3ccfc718a00b403f926e5140e0f1db 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;
@@
-59,8
+57,6
@@
_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
_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
+68,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);
@@
-89,7
+85,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;
@@
-97,7
+93,6
@@
_public_ int sd_bus_call_method_async(
return sd_bus_call_async(bus, slot, m, callback, userdata, 0);
}
return sd_bus_call_async(bus, slot, m, callback, userdata, 0);
}
-#endif // 0
_public_ int sd_bus_call_method(
sd_bus *bus,
_public_ int sd_bus_call_method(
sd_bus *bus,
@@
-109,7
+104,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);
@@
-128,7
+123,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;
@@
-144,7
+139,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);
@@
-167,7
+162,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;
@@
-180,7
+175,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
+204,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
+231,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
+253,13
@@
_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
_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);
@@
-287,7
+280,6
@@
_public_ int sd_bus_reply_method_errnof(
return sd_bus_reply_method_error(call, &berror);
}
return sd_bus_reply_method_error(call, &berror);
}
-#endif // 0
_public_ int sd_bus_get_property(
sd_bus *bus,
_public_ int sd_bus_get_property(
sd_bus *bus,
@@
-331,8
+323,6
@@
fail:
return sd_bus_error_set_errno(error, r);
}
return sd_bus_error_set_errno(error, r);
}
-/// UNNEEDED by elogind
-#if 0
_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
+332,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);
@@
-374,7
+364,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,
@@
-385,7
+374,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
+415,6
@@
fail:
return sd_bus_error_set_errno(error, r);
}
return sd_bus_error_set_errno(error, r);
}
-/// UNNEEDED by elogind
-#if 0
_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
+424,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
+465,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;
@@
-506,7
+493,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;
@@
-520,7
+507,6
@@
_public_ int sd_bus_set_property(
fail:
return sd_bus_error_set_errno(error, r);
}
fail:
return sd_bus_error_set_errno(error, r);
}
-#endif // 0
_public_ int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_bus_creds **creds) {
sd_bus_creds *c;
_public_ int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_bus_creds **creds) {
sd_bus_creds *c;
@@
-567,7
+553,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;