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);

1 files changed, 37 insertions, 34 deletions

diff --git a/render/html.c b/render/html.c
index 62dec9e95..482259f1c 100644
--- a/render/html.c
+++ b/render/html.c
@@ -89,8 +89,8 @@ bool fire_dom_event(dom_string *type, dom_node *target,
 		dom_event_unref(evt);
 		return false;
 	}
-	LOG("Dispatching '%*s' against %p",
-	    dom_string_length(type), dom_string_data(type), target);
+	NSLOG(netsurf, INFO, "Dispatching '%*s' against %p",
+	      dom_string_length(type), dom_string_data(type), target);
 	exc = dom_event_target_dispatch_event(target, evt, &result);
 	if (exc != DOM_NO_ERR) {
 		result = false;
@@ -111,7 +111,7 @@ static void html_box_convert_done(html_content *c, bool success)
 	dom_exception exc; /* returned by libdom functions */
 	dom_node *html;
 
-	LOG("Done XML to box (%p)", c);
+	NSLOG(netsurf, INFO, "Done XML to box (%p)", c);
 
 	/* Clean up and report error if unsuccessful or aborted */
 	if ((success == false) || (c->aborted)) {
@@ -141,7 +141,7 @@ static void html_box_convert_done(html_content *c, bool success)
 		/** @todo should this call html_object_free_objects(c);
 		 * like the other error paths 
 		 */
-		LOG("error retrieving html element from dom");
+		NSLOG(netsurf, INFO, "error retrieving html element from dom");
 		content_broadcast_errorcode(&c->base, NSERROR_DOM);
 		content_set_error(&c->base);
 		return;
@@ -150,7 +150,7 @@ static void html_box_convert_done(html_content *c, bool success)
 	/* extract image maps - can't do this sensibly in dom_to_box */
 	err = imagemap_extract(c);
 	if (err != NSERROR_OK) {
-		LOG("imagemap extraction failed");
+		NSLOG(netsurf, INFO, "imagemap extraction failed");
 		html_object_free_objects(c);
 		content_broadcast_errorcode(&c->base, err);
 		content_set_error(&c->base);
@@ -601,14 +601,14 @@ void html_finish_conversion(html_content *htmlc)
 	}
 
 	/* convert dom tree to box tree */
-	LOG("DOM to box (%p)", htmlc);
+	NSLOG(netsurf, INFO, "DOM to box (%p)", htmlc);
 	content_set_status(&htmlc->base, messages_get("Processing"));
 	msg_data.explicit_status_text = NULL;
 	content_broadcast(&htmlc->base, CONTENT_MSG_STATUS, &msg_data);
 
 	exc = dom_document_get_document_element(htmlc->document, (void *) &html);
 	if ((exc != DOM_NO_ERR) || (html == NULL)) {
-		LOG("error retrieving html element from dom");
+		NSLOG(netsurf, INFO, "error retrieving html element from dom");
 		content_broadcast_errorcode(&htmlc->base, NSERROR_DOM);
 		content_set_error(&htmlc->base);
 		return;
@@ -616,7 +616,7 @@ void html_finish_conversion(html_content *htmlc)
 
 	error = dom_to_box(html, htmlc, html_box_convert_done);
 	if (error != NSERROR_OK) {
-		LOG("box conversion failed");
+		NSLOG(netsurf, INFO, "box conversion failed");
 		dom_node_unref(html);
 		html_object_free_objects(htmlc);
 		content_broadcast_errorcode(&htmlc->base, error);
@@ -687,9 +687,10 @@ dom_default_action_DOMNodeInserted_cb(struct dom_event *evt, void *pw)
 					content_broadcast(&htmlc->base,
 							CONTENT_MSG_GETCTX,
 							&msg_data);
-					LOG("javascript context: %p (htmlc: %p)",
-							htmlc->jscontext,
-							htmlc);
+					NSLOG(netsurf, INFO,
+					      "javascript context: %p (htmlc: %p)",
+					      htmlc->jscontext,
+					      htmlc);
 				}
 				if (htmlc->jscontext != NULL) {
 					js_handle_new_element(htmlc->jscontext,
@@ -795,22 +796,22 @@ html_document_user_data_handler(dom_node_operation operation,
 
 	switch (operation) {
 	case DOM_NODE_CLONED:
-		LOG("Cloned");
+		NSLOG(netsurf, INFO, "Cloned");
 		break;
 	case DOM_NODE_RENAMED:
-		LOG("Renamed");
+		NSLOG(netsurf, INFO, "Renamed");
 		break;
 	case DOM_NODE_IMPORTED:
-		LOG("imported");
+		NSLOG(netsurf, INFO, "imported");
 		break;
 	case DOM_NODE_ADOPTED:
-		LOG("Adopted");
+		NSLOG(netsurf, INFO, "Adopted");
 		break;
 	case DOM_NODE_DELETED:
 		/* This is the only path I expect */
 		break;
 	default:
-		LOG("User data operation not handled.");
+		NSLOG(netsurf, INFO, "User data operation not handled.");
 		assert(0);
 	}
 }
@@ -935,7 +936,7 @@ html_create_html_data(html_content *c, const http_parameter *params)
 		lwc_string_unref(c->universal);
 		c->universal = NULL;
 
-		LOG("Unable to set user data.");
+		NSLOG(netsurf, INFO, "Unable to set user data.");
 		return NSERROR_DOM;
 	}
 
@@ -1142,11 +1143,11 @@ static bool html_convert(struct content *c)
 	exc = dom_document_get_quirks_mode(htmlc->document, &htmlc->quirks);
 	if (exc == DOM_NO_ERR) {
 		html_css_quirks_stylesheets(htmlc);
-		LOG("quirks set to %d", htmlc->quirks);
+		NSLOG(netsurf, INFO, "quirks set to %d", htmlc->quirks);
 	}
 
 	htmlc->base.active--; /* the html fetch is no longer active */
-	LOG("%d fetches active (%p)", htmlc->base.active, c);
+	NSLOG(netsurf, INFO, "%d fetches active (%p)", htmlc->base.active, c);
 
 	/* The parse cannot be completed here because it may be paused
 	 * untill all the resources being fetched have completed.
@@ -1199,11 +1200,11 @@ html_begin_conversion(html_content *htmlc)
 	 * complete to avoid repeating the completion pointlessly.
 	 */
 	if (htmlc->parse_completed == false) {
-		LOG("Completing parse (%p)", htmlc);
+		NSLOG(netsurf, INFO, "Completing parse (%p)", htmlc);
 		/* complete parsing */
 		error = dom_hubbub_parser_completed(htmlc->parser);
 		if (error != DOM_HUBBUB_OK) {
-			LOG("Parsing failed");
+			NSLOG(netsurf, INFO, "Parsing failed");
 	
 			content_broadcast_errorcode(&htmlc->base, 
 						    libdom_hubbub_error_to_nserror(error));
@@ -1214,15 +1215,15 @@ html_begin_conversion(html_content *htmlc)
 	}
 
 	if (html_can_begin_conversion(htmlc) == false) {
-		LOG("Can't begin conversion (%p)", htmlc);
+		NSLOG(netsurf, INFO, "Can't begin conversion (%p)", htmlc);
 		/* We can't proceed (see commentary above) */
 		return true;
 	}
 
 	/* Give up processing if we've been aborted */
 	if (htmlc->aborted) {
-		LOG("Conversion aborted (%p) (active: %u)", htmlc,
-				htmlc->base.active);
+		NSLOG(netsurf, INFO, "Conversion aborted (%p) (active: %u)",
+		      htmlc, htmlc->base.active);
 		content_set_error(&htmlc->base);
 		content_broadcast_errorcode(&htmlc->base, NSERROR_STOPPED);
 		return false;
@@ -1258,7 +1259,7 @@ html_begin_conversion(html_content *htmlc)
 	/* locate root element and ensure it is html */
 	exc = dom_document_get_document_element(htmlc->document, (void *) &html);
 	if ((exc != DOM_NO_ERR) || (html == NULL)) {
-		LOG("error retrieving html element from dom");
+		NSLOG(netsurf, INFO, "error retrieving html element from dom");
 		content_broadcast_errorcode(&htmlc->base, NSERROR_DOM);
 		return false;
 	}
@@ -1268,7 +1269,7 @@ html_begin_conversion(html_content *htmlc)
 	    (node_name == NULL) ||
 	    (!dom_string_caseless_lwc_isequal(node_name,
 	    		corestring_lwc_html))) {
-		LOG("root element not html");
+		NSLOG(netsurf, INFO, "root element not html");
 		content_broadcast_errorcode(&htmlc->base, NSERROR_DOM);
 		dom_node_unref(html);
 		return false;
@@ -1374,7 +1375,8 @@ static void html_stop(struct content *c)
 		break;
 
 	default:
-		LOG("Unexpected status %d (%p)", c->status, c);
+		NSLOG(netsurf, INFO, "Unexpected status %d (%p)", c->status,
+		      c);
 		assert(0);
 	}
 }
@@ -1531,7 +1533,7 @@ static void html_destroy(struct content *c)
 	html_content *html = (html_content *) c;
 	struct form *f, *g;
 
-	LOG("content %p", c);
+	NSLOG(netsurf, INFO, "content %p", c);
 
 	/* Destroy forms */
 	for (f = html->forms; f != NULL; f = g) {
@@ -1920,7 +1922,7 @@ static void html__dom_user_data_handler(dom_node_operation operation,
 		free(data);
 		break;
 	default:
-		LOG("User data operation not handled.");
+		NSLOG(netsurf, INFO, "User data operation not handled.");
 		assert(0);
 	}
 }
@@ -1936,7 +1938,8 @@ static void html__set_file_gadget_filename(struct content *c,
 	ret = guit->utf8->local_to_utf8(fn, 0, &utf8_fn);
 	if (ret != NSERROR_OK) {
 		assert(ret != NSERROR_BAD_ENCODING);
-		LOG("utf8 to local encoding conversion failed");
+		NSLOG(netsurf, INFO,
+		      "utf8 to local encoding conversion failed");
 		/* Load was for us - just no memory */
 		return;		
 	}
@@ -2088,7 +2091,7 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file)
 		if (ret != NSERROR_OK) {
 			/* bad encoding shouldn't happen */
 			assert(ret != NSERROR_BAD_ENCODING);
-			LOG("local to utf8 encoding failed");
+			NSLOG(netsurf, INFO, "local to utf8 encoding failed");
 			free(buffer);
 			guit->misc->warning("NoMemory", NULL);
 			return true;
@@ -2154,19 +2157,19 @@ html_debug_dump(struct content *c, FILE *f, enum content_debug op)
 		ret = NSERROR_OK;
 	} else {
 		if (htmlc->document == NULL) {
-			LOG("No document to dump");
+			NSLOG(netsurf, INFO, "No document to dump");
 			return NSERROR_DOM;
 		}
 
 		exc = dom_document_get_document_element(htmlc->document, (void *) &html);
 		if ((exc != DOM_NO_ERR) || (html == NULL)) {
-			LOG("Unable to obtain root node");
+			NSLOG(netsurf, INFO, "Unable to obtain root node");
 			return NSERROR_DOM;
 		}
 
 		ret = libdom_dump_structure(html, f, 0);
 
-		LOG("DOM structure dump returning %d", ret);
+		NSLOG(netsurf, INFO, "DOM structure dump returning %d", ret);
 
 		dom_node_unref(html);
 	}