From: Karel Zak <kzak@redhat.com>
Date: Tue, 11 Jul 2023 09:49:06 +0000 (+0200)
Subject: dmesg: cleanup function names
X-Git-Tag: v2.40-rc1~339
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8253226fe83b42130d1e04d836bf91b31ff5479;p=thirdparty%2Futil-linux.git

dmesg: cleanup function names

The function read_buffer() also prints data when reads from kmesg. The
name is pretty confusing for readers. Let's rename it.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 59b79245b4..f33a23dc2f 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -239,7 +239,7 @@ struct dmesg_record {
 		(_r)->tv.tv_usec = 0; \
 	} while (0)
 
-static int read_kmsg(struct dmesg_control *ctl);
+static int process_kmsg(struct dmesg_control *ctl);
 
 static int set_level_color(int log_level, const char *mesg, size_t mesgsz)
 {
@@ -590,9 +590,9 @@ static ssize_t read_syslog_buffer(struct dmesg_control *ctl, char **buf)
 }
 
 /*
- * Top level function to read messages
+ * Top level function to read (and print in case of kmesg) messages
  */
-static ssize_t read_buffer(struct dmesg_control *ctl, char **buf)
+static ssize_t process_buffer(struct dmesg_control *ctl, char **buf)
 {
 	ssize_t n = -1;
 
@@ -610,7 +610,7 @@ static ssize_t read_buffer(struct dmesg_control *ctl, char **buf)
 		/*
 		 * Since kernel 3.5.0
 		 */
-		n = read_kmsg(ctl);
+		n = process_kmsg(ctl);
 		break;
 	default:
 		abort();	/* impossible method -> drop core */
@@ -1198,7 +1198,7 @@ static int init_kmsg(struct dmesg_control *ctl)
 	 * but read() returns -EINVAL :-(((
 	 *
 	 * Let's try to read the first record. The record is later processed in
-	 * read_kmsg().
+	 * process_kmsg().
 	 */
 	ctl->kmsg_first_read = read_kmsg_one(ctl);
 	if (ctl->kmsg_first_read < 0) {
@@ -1306,7 +1306,7 @@ mesg:
  *
  * Returns 0 on success, -1 on error.
  */
-static int read_kmsg(struct dmesg_control *ctl)
+static int process_kmsg(struct dmesg_control *ctl)
 {
 	struct dmesg_record rec;
 	ssize_t sz;
@@ -1646,7 +1646,7 @@ int main(int argc, char *argv[])
 			ctl.force_prefix = 0;
 		if (ctl.pager)
 			pager_redirect();
-		n = read_buffer(&ctl, &buf);
+		n = process_buffer(&ctl, &buf);
 		if (n > 0)
 			print_buffer(&ctl, buf, n);
 		if (!ctl.mmap_buff)