chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsckd: the error code is actually returned in 'fd'
[elogind.git]
/
src
/
bus-proxyd
/
bus-proxyd.c
diff --git
a/src/bus-proxyd/bus-proxyd.c
b/src/bus-proxyd/bus-proxyd.c
index b6b0056362f8f071af4092e67b2261b910f0dc65..d612816851291e02b2388460a72631474fe9d800 100644
(file)
--- a/
src/bus-proxyd/bus-proxyd.c
+++ b/
src/bus-proxyd/bus-proxyd.c
@@
-23,13
+23,9
@@
***/
#include <sys/socket.h>
***/
#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/types.h>
-#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <poll.h>
#include <sys/prctl.h>
#include <stddef.h>
#include <getopt.h>
#include <sys/prctl.h>
#include <stddef.h>
#include <getopt.h>
@@
-37,24
+33,14
@@
#include "log.h"
#include "util.h"
#include "log.h"
#include "util.h"
-#include "hashmap.h"
-#include "socket-util.h"
#include "sd-daemon.h"
#include "sd-daemon.h"
-#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-internal.h"
-#include "bus-message.h"
-#include "bus-util.h"
#include "build.h"
#include "strv.h"
#include "def.h"
#include "capability.h"
#include "build.h"
#include "strv.h"
#include "def.h"
#include "capability.h"
-#include "bus-control.h"
-#include "smack-util.h"
-#include "set.h"
#include "bus-xml-policy.h"
#include "bus-xml-policy.h"
-#include "driver.h"
#include "proxy.h"
#include "proxy.h"
-#include "synthesize.h"
static char *arg_address = NULL;
static char **arg_configuration = NULL;
static char *arg_address = NULL;
static char **arg_configuration = NULL;
@@
-82,7
+68,7
@@
static int client_context_new(ClientContext **out) {
c = new0(ClientContext, 1);
if (!c)
c = new0(ClientContext, 1);
if (!c)
- return
log_oom()
;
+ return
-ENOMEM
;
c->fd = -1;
c->fd = -1;