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
/
bus-socket.c
diff --git
a/src/libsystemd/sd-bus/bus-socket.c
b/src/libsystemd/sd-bus/bus-socket.c
index d02994e283b754c13d1005f669f5294a83df9318..c15929c2bbb0755360368d57ef3835b6ddfaed27 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-socket.c
+++ b/
src/libsystemd/sd-bus/bus-socket.c
@@
-20,16
+20,13
@@
***/
#include <endian.h>
***/
#include <endian.h>
-#include <assert.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
#include <unistd.h>
-#include <sys/poll.h>
-#include <byteswap.h>
+#include <poll.h>
#include "util.h"
#include "macro.h"
#include "missing.h"
#include "util.h"
#include "macro.h"
#include "missing.h"
-#include "strv.h"
#include "utf8.h"
#include "sd-daemon.h"
#include "utf8.h"
#include "sd-daemon.h"
@@
-359,8
+356,7
@@
static int bus_socket_auth_write_ok(sd_bus *b) {
assert(b);
assert(b);
- snprintf(t, sizeof(t), "OK " SD_ID128_FORMAT_STR "\r\n", SD_ID128_FORMAT_VAL(b->server_id));
- char_array_0(t);
+ xsprintf(t, "OK " SD_ID128_FORMAT_STR "\r\n", SD_ID128_FORMAT_VAL(b->server_id));
return bus_socket_auth_write(b, t);
}
return bus_socket_auth_write(b, t);
}
@@
-644,12
+640,11
@@
static int bus_socket_start_auth_client(sd_bus *b) {
l = 9;
b->auth_buffer = hexmem("anonymous", l);
} else {
l = 9;
b->auth_buffer = hexmem("anonymous", l);
} else {
- char text[
20 + 1]; /* enough space for a 64bit integer plus NUL */
+ char text[
DECIMAL_STR_MAX(uid_t) + 1];
auth_prefix = "\0AUTH EXTERNAL ";
auth_prefix = "\0AUTH EXTERNAL ";
- snprintf(text, sizeof(text), UID_FMT, geteuid());
- char_array_0(text);
+ xsprintf(text, UID_FMT, geteuid());
l = strlen(text);
b->auth_buffer = hexmem(text, l);
l = strlen(text);
b->auth_buffer = hexmem(text, l);