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/gtk/viewdata.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'frontends/gtk/viewdata.c')

diff --git a/frontends/gtk/viewdata.c b/frontends/gtk/viewdata.c
index 6ed9dd9ac..d633238d0 100644
--- a/frontends/gtk/viewdata.c
+++ b/frontends/gtk/viewdata.c
@@ -371,7 +371,7 @@ window_init(const char *title,
 
 	res = nsgtk_builder_new_from_resname("viewdata", &newctx->builder);
 	if (res != NSERROR_OK) {
-		LOG("Viewdata UI builder init failed");
+		NSLOG(netsurf, INFO, "Viewdata UI builder init failed");
 		free(newctx);
 		return res;
 	}
@@ -381,7 +381,7 @@ window_init(const char *title,
 	window = GTK_WINDOW(gtk_builder_get_object(newctx->builder,
 						   "ViewDataWindow"));
 	if (window == NULL) {
-		LOG("Unable to find window in builder ");
+		NSLOG(netsurf, INFO, "Unable to find window in builder ");
 
 		/* free the builder */
 		g_object_unref(G_OBJECT(newctx->builder));
@@ -616,7 +616,7 @@ static char** xdg_data_strvec(void)
 			 xdg_data_home, xdg_data_dirs);
 	}
 
-	LOG("%s", xdg_data_path);
+	NSLOG(netsurf, INFO, "%s", xdg_data_path);
 
 	svec = filepath_path_to_strvec(xdg_data_path);
 	free(xdg_data_path);
@@ -651,7 +651,7 @@ static char *xdg_get_default_app(const char *path, const char *mimetype)
 	fname = malloc(fname_len);
 	snprintf(fname, fname_len, "%s/applications/defaults.list", path);
 
-	LOG("Checking %s", fname);
+	NSLOG(netsurf, INFO, "Checking %s", fname);
 
 	fp = fopen(fname, "r");
 	free(fname);
@@ -674,8 +674,11 @@ static char *xdg_get_default_app(const char *path, const char *mimetype)
 
 			ret = strdup(line + mimetype_len + 1);
 
-			LOG("Found line match for %s length %zu\n", mimetype, rd);
-			LOG("Result %s", ret);
+			NSLOG(netsurf, INFO,
+			      "Found line match for %s length %zu\n",
+			      mimetype,
+			      rd);
+			NSLOG(netsurf, INFO, "Result %s", ret);
 
 			break;
 		}
@@ -714,7 +717,7 @@ static char *xdg_get_exec_cmd(const char *path, const char *desktop)
 	fname = malloc(fname_len);
 	snprintf(fname, fname_len, "%s/applications/%s", path, desktop);
 
-	LOG("Checking %s", fname);
+	NSLOG(netsurf, INFO, "Checking %s", fname);
 
 	fp = fopen(fname, "r");
 	free(fname);
@@ -735,8 +738,8 @@ static char *xdg_get_exec_cmd(const char *path, const char *desktop)
 
 			ret = strdup(line + SLEN("Exec="));
 
-			LOG("Found Exec length %zu", rd);
-			LOG("Result %s", ret);
+			NSLOG(netsurf, INFO, "Found Exec length %zu", rd);
+			NSLOG(netsurf, INFO, "Result %s", ret);
 
 			break;
 		}
@@ -801,7 +804,7 @@ static char **build_exec_argv(const char *fname, const char *exec_cmd)
 
 		argv[aidx] = exec_arg(start, cur - start, fname);
 		if (argv[aidx] != NULL) {
-			LOG("adding \"%s\"", argv[aidx]);
+			NSLOG(netsurf, INFO, "adding \"%s\"", argv[aidx]);
 			aidx++;
 		}
 	}
-- 
cgit v1.2.3