From eaa5285d6896f669e76148d6e0646fa2d4080857 Mon Sep 17 00:00:00 2001
From: sin <sin@2f30.org>
Date: Mon, 12 Aug 2013 10:17:36 +0100
Subject: [PATCH] Rename syslog_{size,read,show} to dmesg_{size,read,show}

---
 Makefile                      |  2 +-
 dmesg.c                       | 12 ++++++------
 linux/{syslog.c => dmesg.c}   |  6 +++---
 openbsd/{syslog.c => dmesg.c} |  6 +++---
 ubase.h                       |  8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename linux/{syslog.c => dmesg.c} (85%)
 rename openbsd/{syslog.c => dmesg.c} (88%)

diff --git a/Makefile b/Makefile
index 8bd21aa..d26f9d0b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ include config.mk
 
 HDR = util.h arg.h ubase.h
 LIB = \
+	$(OS)/dmesg.o       \
 	$(OS)/grabmntinfo.o \
-	$(OS)/syslog.o      \
 	$(OS)/umount.o      \
 	util/eprintf.o      \
 	util/estrtol.o
diff --git a/dmesg.c b/dmesg.c
index 74a070b..55bd5a7 100644
--- a/dmesg.c
+++ b/dmesg.c
@@ -22,18 +22,18 @@ main(int argc, char *argv[])
 		usage();
 	} ARGEND;
 
-	n = syslog_size();
+	n = dmesg_size();
 	if (n < 0)
-		eprintf("syslog_size:");
+		eprintf("dmesg_size:");
 	buf = malloc(n);
 	if (!buf)
 		eprintf("malloc:");
-	n = syslog_read(buf, n);
+	n = dmesg_read(buf, n);
 	if (n < 0)
-		eprintf("syslog_read:");
-	n = syslog_show(STDOUT_FILENO, buf, n);
+		eprintf("dmesg_read:");
+	n = dmesg_show(STDOUT_FILENO, buf, n);
 	if (n < 0)
-		eprintf("syslog_show:");
+		eprintf("dmesg_show:");
 	free(buf);
 	return 0;
 }
diff --git a/linux/syslog.c b/linux/dmesg.c
similarity index 85%
rename from linux/syslog.c
rename to linux/dmesg.c
index d0d02b8..d5a8522 100644
--- a/linux/syslog.c
+++ b/linux/dmesg.c
@@ -9,19 +9,19 @@ enum {
 };
 
 int
-syslog_size(void)
+dmesg_size(void)
 {
 	return klogctl(SYSLOG_ACTION_SIZE_BUFFER, NULL, 0);
 }
 
 int
-syslog_read(void *buf, size_t n)
+dmesg_read(void *buf, size_t n)
 {
 	return klogctl(SYSLOG_ACTION_READ_ALL, buf, n);
 }
 
 int
-syslog_show(int fd, const void *buf, size_t n)
+dmesg_show(int fd, const void *buf, size_t n)
 {
 	int last = '\n';
 	const char *p = buf;
diff --git a/openbsd/syslog.c b/openbsd/dmesg.c
similarity index 88%
rename from openbsd/syslog.c
rename to openbsd/dmesg.c
index e826ea6..de7f952 100644
--- a/openbsd/syslog.c
+++ b/openbsd/dmesg.c
@@ -8,7 +8,7 @@
 #include <string.h>
 
 int
-syslog_size(void)
+dmesg_size(void)
 {
 	int mib[2], msgbufsize;
 	size_t len;
@@ -25,7 +25,7 @@ syslog_size(void)
 }
 
 int
-syslog_read(void *buf, size_t n)
+dmesg_read(void *buf, size_t n)
 {
 	int mib[2];
 	int ret;
@@ -41,7 +41,7 @@ syslog_read(void *buf, size_t n)
 }
 
 int
-syslog_show(int fd, const void *buf, size_t n)
+dmesg_show(int fd, const void *buf, size_t n)
 {
 	return write(fd, buf, n);
 }
diff --git a/ubase.h b/ubase.h
index 0eb2c25..6565c8a 100644
--- a/ubase.h
+++ b/ubase.h
@@ -8,10 +8,10 @@ struct mntinfo {
 
 int grabmntinfo(struct mntinfo **minfo);
 
-/* syslog.c */
-int syslog_size(void);
-int syslog_read(void *buf, size_t n);
-int syslog_show(int fd, const void *buf, size_t n);
+/* dmesg.c */
+int dmesg_size(void);
+int dmesg_read(void *buf, size_t n);
+int dmesg_show(int fd, const void *buf, size_t n);
 
 /* umount.c */
 enum {