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-icmp6-nd: Add helper function to get the IPv6 link MTU
[elogind.git]
/
src
/
journal
/
journal-send.c
diff --git
a/src/journal/journal-send.c
b/src/journal/journal-send.c
index 0ee83cdb778fc75421049697b6864c6f6d64be12..65fefd25ac62c8472d2fdb2b8f5d66305119af54 100644
(file)
--- a/
src/journal/journal-send.c
+++ b/
src/journal/journal-send.c
@@
-32,7
+32,7
@@
#include "sd-journal.h"
#include "util.h"
#include "socket-util.h"
#include "sd-journal.h"
#include "util.h"
#include "socket-util.h"
-#include "memfd.h"
+#include "memfd
-util
.h"
#define SNDBUF_SIZE (8*1024*1024)
#define SNDBUF_SIZE (8*1024*1024)
@@
-384,7
+384,7
@@
static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
memcpy(buffer + 8 + k - 2, ": ", 2);
}
memcpy(buffer + 8 + k - 2, ": ", 2);
}
- snprintf(error, sizeof(error), "ERRNO=%
u
", _saved_errno_);
+ snprintf(error, sizeof(error), "ERRNO=%
i
", _saved_errno_);
char_array_0(error);
IOVEC_SET_STRING(iov[skip+0], "PRIORITY=3");
char_array_0(error);
IOVEC_SET_STRING(iov[skip+0], "PRIORITY=3");
@@
-453,13
+453,10
@@
_public_ int sd_journal_stream_fd(const char *identifier, int priority, int leve
header[l++] = '0';
header[l++] = '\n';
header[l++] = '0';
header[l++] = '\n';
- r =
(int)
loop_write(fd, header, l, false);
+ r = loop_write(fd, header, l, false);
if (r < 0)
return r;
if (r < 0)
return r;
- if ((size_t) r != l)
- return -errno;
-
r = fd;
fd = -1;
return r;
r = fd;
fd = -1;
return r;