From 75018632a9b953aafeae6f4e8aea607fd1d89dca Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Wed, 6 Sep 2017 18:28:12 +0100
Subject: Use coccinelle to change logging macro calls in c files

for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done

@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
---
 frontends/monkey/browser.c  | 2 +-
 frontends/monkey/dispatch.c | 2 +-
 frontends/monkey/filetype.c | 3 ++-
 frontends/monkey/main.c     | 8 ++++----
 frontends/monkey/schedule.c | 7 ++++---
 5 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'frontends/monkey')

diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index 16d33010d..1fbbbf0b1 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -471,7 +471,7 @@ monkey_window_handle_redraw(int argc, char **argv)
 		clip.y1 = atoi(argv[6]);
 	}
   
-	LOG("Issue redraw");
+	NSLOG(netsurf, INFO, "Issue redraw");
 	fprintf(stdout, "WINDOW REDRAW WIN %d START\n", atoi(argv[2]));
 	browser_window_redraw(gw->bw, gw->scrollx, gw->scrolly, &clip, &ctx);  
 	fprintf(stdout, "WINDOW REDRAW WIN %d STOP\n", atoi(argv[2]));
diff --git a/frontends/monkey/dispatch.c b/frontends/monkey/dispatch.c
index b531f05f9..e60325cf1 100644
--- a/frontends/monkey/dispatch.c
+++ b/frontends/monkey/dispatch.c
@@ -40,7 +40,7 @@ monkey_register_handler(const char *cmd, handle_command_fn fn)
 {
 	monkey_cmdhandler_t *ret = calloc(sizeof(*ret), 1);
 	if (ret == NULL) {
-		LOG("Unable to allocate handler");
+		NSLOG(netsurf, INFO, "Unable to allocate handler");
 		return NSERROR_NOMEM;
 	}
 	ret->cmd = strdup(cmd);
diff --git a/frontends/monkey/filetype.c b/frontends/monkey/filetype.c
index 20bd1edad..979796baf 100644
--- a/frontends/monkey/filetype.c
+++ b/frontends/monkey/filetype.c
@@ -85,7 +85,8 @@ void monkey_fetch_filetype_init(const char *mimefile)
 	fh = fopen(mimefile, "r");
 
 	if (fh == NULL) {
-		LOG("Unable to open a mime.types file, so using a minimal one for you.");
+		NSLOG(netsurf, INFO,
+		      "Unable to open a mime.types file, so using a minimal one for you.");
 		return;
 	}
 
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 1bea02471..d697f271f 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -278,20 +278,20 @@ static void monkey_run(void)
 		/* setup timeout */
 		switch (schedtm) {
 		case -1:
-			LOG("Iterate blocking");
+			NSLOG(netsurf, INFO, "Iterate blocking");
 			fprintf(stdout, "GENERIC POLL BLOCKING\n");
 			timeout = NULL;
 			break;
 
 		case 0:
-			LOG("Iterate immediate");
+			NSLOG(netsurf, INFO, "Iterate immediate");
 			tv.tv_sec = 0;
 			tv.tv_usec = 0;
 			timeout = &tv;
 			break;
 
 		default:
-			LOG("Iterate non-blocking");
+			NSLOG(netsurf, INFO, "Iterate non-blocking");
 			fprintf(stdout, "GENERIC POLL TIMED %d\n", schedtm);
 			tv.tv_sec = schedtm / 1000; /* miliseconds to seconds */
 			tv.tv_usec = (schedtm % 1000) * 1000; /* remainder to microseconds */
@@ -361,7 +361,7 @@ main(int argc, char **argv)
 	messages = filepath_find(respaths, "Messages");
 	ret = messages_add_from_file(messages);
 	if (ret != NSERROR_OK) {
-		LOG("Messages failed to load");
+		NSLOG(netsurf, INFO, "Messages failed to load");
 	}
 
 	/* common initialisation */
diff --git a/frontends/monkey/schedule.c b/frontends/monkey/schedule.c
index af1144a0e..b34bd5aa5 100644
--- a/frontends/monkey/schedule.c
+++ b/frontends/monkey/schedule.c
@@ -204,13 +204,14 @@ void monkey_schedule_list(void)
 
 	gettimeofday(&tv, NULL);
 
-	LOG("schedule list at %lld:%ld", (long long)tv.tv_sec, tv.tv_usec);
+	NSLOG(netsurf, INFO, "schedule list at %lld:%ld",
+	      (long long)tv.tv_sec, tv.tv_usec);
 
 	cur_nscb = schedule_list;
 
 	while (cur_nscb != NULL) {
-		LOG("Schedule %p at %lld:%ld",
-		    cur_nscb, (long long)cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec);
+		NSLOG(netsurf, INFO, "Schedule %p at %lld:%ld", cur_nscb,
+		      (long long)cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec);
 		cur_nscb = cur_nscb->next;
 	}
 }
-- 
cgit v1.2.3