From: Timo Kokkonen <timo.t.kokkonen@iki.fi>
Date: Sun, 6 Oct 2013 14:58:10 +0000 (+0300)
Subject: Convert all existing prints into appropriate trace print
X-Git-Url: http://git.itanic.dy.fi/?p=log-plotter;a=commitdiff_plain;h=c09aecf6425bcb67d0deb8748ef86379211980b8

Convert all existing prints into appropriate trace print

Don't use printf for trace messages as we have the new tracing code.

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
---

diff --git a/baud.c b/baud.c
index 834974e..4fd5168 100644
--- a/baud.c
+++ b/baud.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <linux/termios.h>
 #include <unistd.h>
+#include "debug.h"
 
 /*
  * HACK: declare the ioctl function by hand...
@@ -33,12 +34,12 @@ int open_at_baud(const char *device, int *baud)
 	fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY);
 
 	if (fd == -1) {
-		fprintf(stderr, "error opening %s: %m\n",	device);
+		pr_err("error opening %s: %m\n", device);
 		return fd;
 	}
 
 	if (ioctl(fd, TCGETS2, &tios)) {
-		perror("TCGETS2");
+		pr_err("TCGETS2: %m\n");
 		goto err;
 	}
 
@@ -48,12 +49,12 @@ int open_at_baud(const char *device, int *baud)
 	tios.c_ospeed = *baud;
 
 	if (ioctl(fd, TCSETS2, &tios)) {
-		perror("TCSETS2");
+		pr_err("TCSETS2: %m");
 		goto err;
 	}
 
 	if (ioctl(fd, TCGETS2, &tios)) {
-		perror("TCGETS2");
+		pr_err("TCGETS2: %m");
 		goto err;
 	}
 
diff --git a/main.c b/main.c
index d81f733..065d9dc 100644
--- a/main.c
+++ b/main.c
@@ -4,6 +4,7 @@
 
 #include "options.h"
 #include "baud.h"
+#include "debug.h"
 
 int main(int argc, char *argv[])
 {
@@ -23,7 +24,7 @@ int main(int argc, char *argv[])
 		return 1;
 
 	if (baud != options.baud_rate) {
-		printf("Failed to set baudrate to %d, only got %d\n",
+		pr_err("Failed to set baudrate to %d, only got %d\n",
 			options.baud_rate, baud);
 		close(fd);
 		return 1;
@@ -34,7 +35,7 @@ int main(int argc, char *argv[])
 	ev.events = EPOLLIN;
 	ev.data.fd = fd;
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
-		perror("epoll_ctl");
+		pr_err("epoll_ctl: %m\n");
 		return 1;
 	}
 
@@ -44,22 +45,24 @@ int main(int argc, char *argv[])
 			continue;
 
 		if (ret < 0) {
-			perror("epoll");
+			pr_err("epoll: %m\n");
 			return 1;
 		}
 
 		ret = read(fd, buf, sizeof(buf));
 		if (read < 0) {
-			perror("read");
+			pr_err("read: %m\n");
 			break;
 		}
 
-		if (ret == 0)
+		if (ret == 0) {
+			pr_err("Read EOF, stopping\n");
 			break;
+		}
 
 		ret = write(1, buf, ret);
 		if (read < 0) {
-			perror("write");
+			pr_err("write: %m\n");
 			break;
 		}
 	}