From b2f10ad91dfa2526065df6d9a123454c452c8af5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20Januszewski?= <spock@gentoo.org>
Date: Fri, 19 Oct 2007 00:21:22 +0200
Subject: [PATCH] Refactor code to properly use log levels.

---
 v86.c        | 4 ++--
 v86.h        | 2 +-
 v86_common.c | 2 +-
 v86_mem.c    | 6 +++---
 v86_x86emu.c | 8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/v86.c b/v86.c
index d4d25b9..c176d03 100644
--- a/v86.c
+++ b/v86.c
@@ -41,7 +41,7 @@ static int netlink_send(int s, struct cn_msg *msg)
 
 	err = send(s, nlh, size, 0);
 	if (err == -1)
-		ulog("Failed to send: %s [%d].\n", strerror(errno), errno);
+		ulog(LOG_ERR, "Failed to send: %s [%d].\n", strerror(errno), errno);
 
 	return err;
 }
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
 
 		switch (reply->nlmsg_type) {
 		case NLMSG_ERROR:
-			ulog("Error message received.\n");
+			ulog(LOG_ERR, "Error message received.\n");
 			break;
 
 		case NLMSG_DONE:
diff --git a/v86.h b/v86.h
index 8214fe2..312baf9 100644
--- a/v86.h
+++ b/v86.h
@@ -23,7 +23,7 @@ struct completion;
 //#define ulog(args...)	do {} while (0)
 //#define ulog(args...)		fprintf(stdout, ##args)
 
-#define ulog(args...)	syslog(LOG_INFO, ##args)
+#define ulog(level, args...)	syslog(level, ##args)
 
 int v86_init();
 int v86_int(int num, struct v86_regs *regs);
diff --git a/v86_common.c b/v86_common.c
index 132b230..44cb4ab 100644
--- a/v86_common.c
+++ b/v86_common.c
@@ -72,7 +72,7 @@ int v86_task(struct uvesafb_task *tsk, u8 *buf)
 
 		/* Mode list is somewhere else. We're seriously screwed. */
 		} else {
-			ulog("Can't retrieve mode list from %x\n", t);
+			ulog(LOG_ERR, "Can't retrieve mode list from %x\n", t);
 			ib->mode_list_ptr = 0;
 		}
 
diff --git a/v86_mem.c b/v86_mem.c
index c6bdebb..d5eb05a 100644
--- a/v86_mem.c
+++ b/v86_mem.c
@@ -30,7 +30,7 @@ void *vptr(u32 addr) {
 	else if (addr >= BIOS_BASE && addr < BIOS_BASE + BIOS_SIZE)
 		return (mem_bios + addr - BIOS_BASE);
 	else {
-		ulog("trying to access an unsupported memory region at %x", addr);
+		ulog(LOG_WARNING, "Trying to access an unsupported memory region at %x", addr);
 		return NULL;
 	}
 }
@@ -72,14 +72,14 @@ static void *map_file(void *start, size_t length, int prot, int flags, char *nam
 	fd = open(name, (flags & MAP_SHARED) ? O_RDWR : O_RDONLY);
 
 	if (fd == -1) {
-		ulog("open '%s' failed with: %s\n", name, strerror(errno));
+		ulog(LOG_ERR, "Open '%s' failed with: %s\n", name, strerror(errno));
 		return NULL;
 	}
 
 	m = mmap(start, length, prot, flags, fd, offset);
 
 	if (m == (void *)-1) {
-		ulog("mmap '%s' failed with: %s\n", name, strerror(errno));
+		ulog(LOG_ERR, "mmap '%s' failed with: %s\n", name, strerror(errno));
 		close(fd);
 		return NULL;
 	}
diff --git a/v86_x86emu.c b/v86_x86emu.c
index 8663ab9..b608860 100644
--- a/v86_x86emu.c
+++ b/v86_x86emu.c
@@ -162,19 +162,19 @@ int v86_int(int num, struct v86_regs *regs)
 
 void v86_dump_regs()
 {
-	ulog(
+	ulog(LOG_DEBUG,
 		"EAX=0x%8.8lx, EBX=0x%8.8lx, ECX=0x%8.8lx, EDX=0x%8.8lx\n",
 		(unsigned long)X86_EAX, (unsigned long)X86_EBX,
 		(unsigned long)X86_ECX, (unsigned long)X86_EDX);
-	ulog(
+	ulog(LOG_DEBUG,
 		"ESP=0x%8.8lx, EBP=0x%8.8lx, ESI=0x%8.8lx, EDI=0x%8.8lx\n",
 		(unsigned long)X86_ESP, (unsigned long)X86_EBP,
 		(unsigned long)X86_ESI, (unsigned long)X86_EDI);
-    ulog(
+    ulog(LOG_DEBUG,
 		"CS=0x%4.4x, SS=0x%4.4x,"
 		" DS=0x%4.4x, ES=0x%4.4x, FS=0x%4.4x, GS=0x%4.4x\n",
 		X86_CS, X86_SS, X86_DS, X86_ES, X86_FS, X86_GS);
-    ulog(
+    ulog(LOG_DEBUG,
 		"EIP=0x%8.8lx, EFLAGS=0x%8.8lx\n",
 		(unsigned long)X86_EIP, (unsigned long)X86_EFLAGS);
 }
-- 
2.11.4.GIT