chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d12cc3
)
bus: allow specifying NULL as type string when we want to construct messages with...
author
Lennart Poettering
<lennart@poettering.net>
Fri, 11 Oct 2013 03:20:24 +0000
(
05:20
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 11 Oct 2013 03:20:24 +0000
(
05:20
+0200)
src/libsystemd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index 342af4d1d5c4c7a385364121a5176ac17e6eb35f..542b5e8c49e6d0c5b6ec8f8992f7d6b7641be112 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-3398,7
+3398,6
@@
int sd_bus_emit_signal(
const char *types, ...) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
const char *types, ...) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
- va_list ap;
int r;
if (!bus)
int r;
if (!bus)
@@
-3412,11
+3411,15
@@
int sd_bus_emit_signal(
if (r < 0)
return r;
if (r < 0)
return r;
- va_start(ap, types);
- r = bus_message_append_ap(m, types, ap);
- va_end(ap);
- if (r < 0)
- return r;
+ if (!isempty(types)) {
+ va_list ap;
+
+ va_start(ap, types);
+ r = bus_message_append_ap(m, types, ap);
+ va_end(ap);
+ if (r < 0)
+ return r;
+ }
return sd_bus_send(bus, m, NULL);
}
return sd_bus_send(bus, m, NULL);
}
@@
-3432,7
+3435,6
@@
int sd_bus_call_method(
const char *types, ...) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
const char *types, ...) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
- va_list ap;
int r;
if (!bus)
int r;
if (!bus)
@@
-3447,11
+3449,15
@@
int sd_bus_call_method(
if (r < 0)
return r;
if (r < 0)
return r;
- va_start(ap, types);
- r = bus_message_append_ap(m, types, ap);
- va_end(ap);
- if (r < 0)
- return r;
+ if (!isempty(types)) {
+ va_list ap;
+
+ va_start(ap, types);
+ r = bus_message_append_ap(m, types, ap);
+ va_end(ap);
+ if (r < 0)
+ return r;
+ }
return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply);
}
return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply);
}
@@
-3462,7
+3468,6
@@
int sd_bus_reply_method_return(
const char *types, ...) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
const char *types, ...) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
- va_list ap;
int r;
if (!bus)
int r;
if (!bus)
@@
-3485,11
+3490,15
@@
int sd_bus_reply_method_return(
if (r < 0)
return r;
if (r < 0)
return r;
- va_start(ap, types);
- r = bus_message_append_ap(m, types, ap);
- va_end(ap);
- if (r < 0)
- return r;
+ if (!isempty(types)) {
+ va_list ap;
+
+ va_start(ap, types);
+ r = bus_message_append_ap(m, types, ap);
+ va_end(ap);
+ if (r < 0)
+ return r;
+ }
return sd_bus_send(bus, m, NULL);
}
return sd_bus_send(bus, m, NULL);
}