midfavila/ubase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

No need for dmesg_show() to have an fd

Browse Source
This commit is contained in:
sin 2014-11-30 13:28:01 +00:00
parent 10d6bf2f4d
commit 4cb108f557
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmesg.c
View File

@ -8,7 +8,7 @@
#include "util.h" #include "util.h"
static void dmesg_show(int fd, const void *buf, size_t n); static void dmesg_show(const void *buf, size_t n);
enum { enum {
SYSLOG_ACTION_READ_ALL = 3, SYSLOG_ACTION_READ_ALL = 3,
@ -60,7 +60,7 @@ main(int argc, char *argv[])
if (n < 0) if (n < 0)
eprintf("klogctl:"); eprintf("klogctl:");
dmesg_show(1, buf, n); dmesg_show(buf, n);
if (cflag && klogctl(SYSLOG_ACTION_CLEAR, NULL, 0) < 0) if (cflag && klogctl(SYSLOG_ACTION_CLEAR, NULL, 0) < 0)
eprintf("klogctl:"); eprintf("klogctl:");
@ -70,12 +70,12 @@ main(int argc, char *argv[])
} }
static void static void
dmesg_show(int fd, const void *buf, size_t n) dmesg_show(const void *buf, size_t n)
{ {
const char *p = buf; const char *p = buf;
ssize_t r; ssize_t r;
r = write(fd, p, n); r = write(1, p, n);
if (r < 0) if (r < 0)
eprintf("write:"); eprintf("write:");
if (r > 0 && p[r - 1] != '\n') if (r > 0 && p[r - 1] != '\n')