chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: merge change_attr_fd() and chattr_fd()
[elogind.git]
/
src
/
shared
/
logs-show.c
diff --git
a/src/shared/logs-show.c
b/src/shared/logs-show.c
index 45741f9e9da1dcad1e9cb7794c1caa02679c8fbd..4e1b87814be77556fb940804247b2ff5051b1111 100644
(file)
--- a/
src/shared/logs-show.c
+++ b/
src/shared/logs-show.c
@@
-20,9
+20,7
@@
***/
#include <time.h>
***/
#include <time.h>
-#include <assert.h>
#include <errno.h>
#include <errno.h>
-#include <sys/poll.h>
#include <sys/socket.h>
#include <string.h>
#include <fcntl.h>
#include <sys/socket.h>
#include <string.h>
#include <fcntl.h>
@@
-32,7
+30,6
@@
#include "util.h"
#include "utf8.h"
#include "hashmap.h"
#include "util.h"
#include "utf8.h"
#include "hashmap.h"
-#include "fileio.h"
#include "journal-internal.h"
/* up to three lines (each up to 100 characters),
#include "journal-internal.h"
/* up to three lines (each up to 100 characters),
@@
-993,7
+990,7
@@
static int show_journal(FILE *f,
if (warn_cutoff && line < how_many && not_before > 0) {
sd_id128_t boot_id;
if (warn_cutoff && line < how_many && not_before > 0) {
sd_id128_t boot_id;
- usec_t cutoff;
+ usec_t cutoff
= 0
;
/* Check whether the cutoff line is too early */
/* Check whether the cutoff line is too early */
@@
-1166,9
+1163,9
@@
static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
if (fd < 0)
_exit(EXIT_FAILURE);
if (fd < 0)
_exit(EXIT_FAILURE);
-
k = loop_read
(fd, buf, 36, false);
+
r = loop_read_exact
(fd, buf, 36, false);
safe_close(fd);
safe_close(fd);
- if (
k != 36
)
+ if (
r < 0
)
_exit(EXIT_FAILURE);
k = send(pair[1], buf, 36, MSG_NOSIGNAL);
_exit(EXIT_FAILURE);
k = send(pair[1], buf, 36, MSG_NOSIGNAL);