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 6fe65479a79a6376ce47631ea4470e65267adf5d..1eb7264621ac2db84f22c55b116f817299a0c494 100644
(file)
--- a/
src/libelogind/sd-bus/bus-convenience.c
+++ b/
src/libelogind/sd-bus/bus-convenience.c
@@
-48,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;
@@
-86,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;
@@
-125,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;
@@
-164,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;
@@
-327,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,
@@
-369,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,
@@
-500,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;