chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
test-bus-server.c
diff --git
a/src/libsystemd/sd-bus/test-bus-server.c
b/src/libsystemd/sd-bus/test-bus-server.c
index 30e2d8cf443f974f5a87be2c518cb468727640f3..080d8eddb76ddc2fa4c939c13050cf6a5a3eefa7 100644
(file)
--- a/
src/libsystemd/sd-bus/test-bus-server.c
+++ b/
src/libsystemd/sd-bus/test-bus-server.c
@@
-19,11
+19,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <stdlib.h>
#include <pthread.h>
#include <stdlib.h>
#include <pthread.h>
-#include <unistd.h>
-#include <fcntl.h>
#include "log.h"
#include "util.h"
#include "log.h"
#include "util.h"
@@
-31,7
+28,6
@@
#include "sd-bus.h"
#include "bus-internal.h"
#include "sd-bus.h"
#include "bus-internal.h"
-#include "bus-message.h"
#include "bus-util.h"
struct context {
#include "bus-util.h"
struct context {
@@
-65,14
+61,14
@@
static void *server(void *p) {
r = sd_bus_process(bus, &m);
if (r < 0) {
r = sd_bus_process(bus, &m);
if (r < 0) {
- log_error_errno(
-
r, "Failed to process requests: %m");
+ log_error_errno(r, "Failed to process requests: %m");
goto fail;
}
if (r == 0) {
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
goto fail;
}
if (r == 0) {
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(
-
r, "Failed to wait: %m");
+ log_error_errno(r, "Failed to wait: %m");
goto fail;
}
goto fail;
}
@@
-90,7
+86,7
@@
static void *server(void *p) {
r = sd_bus_message_new_method_return(m, &reply);
if (r < 0) {
r = sd_bus_message_new_method_return(m, &reply);
if (r < 0) {
- log_error_errno(
-
r, "Failed to allocate return: %m");
+ log_error_errno(r, "Failed to allocate return: %m");
goto fail;
}
goto fail;
}
@@
-102,7
+98,7
@@
static void *server(void *p) {
&reply,
&SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
if (r < 0) {
&reply,
&SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
if (r < 0) {
- log_error_errno(
-
r, "Failed to allocate return: %m");
+ log_error_errno(r, "Failed to allocate return: %m");
goto fail;
}
}
goto fail;
}
}
@@
-110,7
+106,7
@@
static void *server(void *p) {
if (reply) {
r = sd_bus_send(bus, reply, NULL);
if (r < 0) {
if (reply) {
r = sd_bus_send(bus, reply, NULL);
if (r < 0) {
- log_error_errno(
-
r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
}
goto fail;
}
}
@@
-146,10
+142,8
@@
static int client(struct context *c) {
"/",
"org.freedesktop.systemd.test",
"Exit");
"/",
"org.freedesktop.systemd.test",
"Exit");
- if (r < 0) {
- log_error_errno(-r, "Failed to allocate method call: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to allocate method call: %m");
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0) {
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0) {