chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: add async convenience method call API
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
test-bus-chat.c
diff --git
a/src/libelogind/sd-bus/test-bus-chat.c
b/src/libelogind/sd-bus/test-bus-chat.c
index 7f49fe90fab2a255be6fb86d6246857df77eb874..046e999008283941f1087f37f2fc5466f0a66a70 100644
(file)
--- a/
src/libelogind/sd-bus/test-bus-chat.c
+++ b/
src/libelogind/sd-bus/test-bus-chat.c
@@
-27,6
+27,7
@@
#include "log.h"
#include "util.h"
#include "macro.h"
#include "log.h"
#include "util.h"
#include "macro.h"
+#include "formats-util.h"
#include "sd-bus.h"
#include "bus-error.h"
#include "sd-bus.h"
#include "bus-error.h"
@@
-34,16
+35,14
@@
#include "bus-internal.h"
#include "bus-util.h"
#include "bus-internal.h"
#include "bus-util.h"
-static int match_callback(sd_bus
*bus, sd_bus
_message *m, void *userdata, sd_bus_error *ret_error) {
+static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));
return 0;
}
log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));
return 0;
}
-static int object_callback(sd_bus
*bus, sd_bus
_message *m, void *userdata, sd_bus_error *ret_error) {
+static int object_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
int r;
int r;
- assert_se(bus);
-
if (sd_bus_message_is_method_error(m, NULL))
return 0;
if (sd_bus_message_is_method_error(m, NULL))
return 0;
@@
-263,11
+262,11
@@
fail:
static void* client1(void*p) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
static void* client1(void*p) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
- sd_bus *bus = NULL;
- sd_bus_error error = SD_BUS_ERROR_NULL;
+
_cleanup_bus_close_unref_
sd_bus *bus = NULL;
+
_cleanup_bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
const char *hello;
int r;
const char *hello;
int r;
- int pp[2] = { -1, -1 };
+
_cleanup_close_pair_
int pp[2] = { -1, -1 };
char x;
r = sd_bus_open_user(&bus);
char x;
r = sd_bus_open_user(&bus);
@@
-346,18
+345,12
@@
finish:
else
sd_bus_send(bus, q, NULL);
else
sd_bus_send(bus, q, NULL);
- sd_bus_flush(bus);
- sd_bus_unref(bus);
}
}
- sd_bus_error_free(&error);
-
- safe_close_pair(pp);
-
return INT_TO_PTR(r);
}
return INT_TO_PTR(r);
}
-static int quit_callback(sd_bus
*b, sd_bus
_message *m, void *userdata, sd_bus_error *ret_error) {
+static int quit_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
bool *x = userdata;
log_error("Quit callback: %s", strerror(sd_bus_message_get_errno(m)));
bool *x = userdata;
log_error("Quit callback: %s", strerror(sd_bus_message_get_errno(m)));
@@
-368,8
+361,8
@@
static int quit_callback(sd_bus *b, sd_bus_message *m, void *userdata, sd_bus_er
static void* client2(void*p) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
static void* client2(void*p) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
- sd_bus *bus = NULL;
- sd_bus_error error = SD_BUS_ERROR_NULL;
+
_cleanup_bus_close_unref_
sd_bus *bus = NULL;
+
_cleanup_bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
bool quit = false;
const char *mid;
int r;
bool quit = false;
const char *mid;
int r;
@@
-398,8
+391,7
@@
static void* client2(void*p) {
goto finish;
}
goto finish;
}
- sd_bus_message_unref(m);
- m = NULL;
+ m = sd_bus_message_unref(m);
r = sd_bus_message_new_signal(
bus,
r = sd_bus_message_new_signal(
bus,
@@
-418,8
+410,7
@@
static void* client2(void*p) {
goto finish;
}
goto finish;
}
- sd_bus_message_unref(m);
- m = NULL;
+ m = sd_bus_message_unref(m);
r = sd_bus_message_new_method_call(
bus,
r = sd_bus_message_new_method_call(
bus,
@@
-447,8
+438,7
@@
static void* client2(void*p) {
log_info("Machine ID is %s.", mid);
log_info("Machine ID is %s.", mid);
- sd_bus_message_unref(m);
- m = NULL;
+ m = sd_bus_message_unref(m);
r = sd_bus_message_new_method_call(
bus,
r = sd_bus_message_new_method_call(
bus,
@@
-462,8
+452,7
@@
static void* client2(void*p) {
goto finish;
}
goto finish;
}
- sd_bus_message_unref(reply);
- reply = NULL;
+ reply = sd_bus_message_unref(reply);
r = sd_bus_call(bus, m, 200 * USEC_PER_MSEC, &error, &reply);
if (r < 0)
r = sd_bus_call(bus, m, 200 * USEC_PER_MSEC, &error, &reply);
if (r < 0)
@@
-471,8
+460,7
@@
static void* client2(void*p) {
else
log_info("Slow call succeed.");
else
log_info("Slow call succeed.");
- sd_bus_message_unref(m);
- m = NULL;
+ m = sd_bus_message_unref(m);
r = sd_bus_message_new_method_call(
bus,
r = sd_bus_message_new_method_call(
bus,
@@
-525,12
+513,9
@@
finish:
goto finish;
}
goto finish;
}
- sd_bus_send(bus, q, NULL);
- sd_bus_flush(bus);
- sd_bus_unref(bus);
+ (void) sd_bus_send(bus, q, NULL);
}
}
- sd_bus_error_free(&error);
return INT_TO_PTR(r);
}
return INT_TO_PTR(r);
}