Change LOG() macro to be varadic

This changes the LOG macro to be varadic removing the need for all
callsites to have double bracketing and allows for future improvement
on how we use the logging macros.

The callsites were changed with coccinelle and the changes checked by
hand. Compile tested for several frontends but not all.

A formatting annotation has also been added which allows the compiler
to check the parameters and types passed to the logging.

1 files changed, 19 insertions, 28 deletions

diff --git a/render/html_script.c b/render/html_script.c
index 2ebdffc12..07bee51c1 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -163,21 +163,18 @@ convert_script_async_cb(hlcache_handle *script,
 		break;
 
 	case CONTENT_MSG_DONE:
-		LOG(("script %d done '%s'", i,
-				nsurl_access(hlcache_handle_get_url(script))));
+		LOG("script %d done '%s'", i, nsurl_access(hlcache_handle_get_url(script)));
 		parent->base.active--;
-		LOG(("%d fetches active", parent->base.active));
+		LOG("%d fetches active", parent->base.active);
 
 		break;
 
 	case CONTENT_MSG_ERROR:
-		LOG(("script %s failed: %s",
-				nsurl_access(hlcache_handle_get_url(script)),
-				event->data.error));
+		LOG("script %s failed: %s", nsurl_access(hlcache_handle_get_url(script)), event->data.error);
 		hlcache_handle_release(script);
 		s->data.handle = NULL;
 		parent->base.active--;
-		LOG(("%d fetches active", parent->base.active));
+		LOG("%d fetches active", parent->base.active);
 		content_add_error(&parent->base, "?", 0);
 
 		break;
@@ -212,21 +209,18 @@ convert_script_defer_cb(hlcache_handle *script,
 	switch (event->type) {
 
 	case CONTENT_MSG_DONE:
-		LOG(("script %d done '%s'", i,
-				nsurl_access(hlcache_handle_get_url(script))));
+		LOG("script %d done '%s'", i, nsurl_access(hlcache_handle_get_url(script)));
 		parent->base.active--;
-		LOG(("%d fetches active", parent->base.active));
+		LOG("%d fetches active", parent->base.active);
 
 		break;
 
 	case CONTENT_MSG_ERROR:
-		LOG(("script %s failed: %s",
-				nsurl_access(hlcache_handle_get_url(script)),
-				event->data.error));
+		LOG("script %s failed: %s", nsurl_access(hlcache_handle_get_url(script)), event->data.error);
 		hlcache_handle_release(script);
 		s->data.handle = NULL;
 		parent->base.active--;
-		LOG(("%d fetches active", parent->base.active));
+		LOG("%d fetches active", parent->base.active);
 		content_add_error(&parent->base, "?", 0);
 
 		break;
@@ -269,10 +263,9 @@ convert_script_sync_cb(hlcache_handle *script,
 
 	switch (event->type) {
 	case CONTENT_MSG_DONE:
-		LOG(("script %d done '%s'", i,
-				nsurl_access(hlcache_handle_get_url(script))));
+		LOG("script %d done '%s'", i, nsurl_access(hlcache_handle_get_url(script)));
 		parent->base.active--;
-		LOG(("%d fetches active", parent->base.active));
+		LOG("%d fetches active", parent->base.active);
 
 		s->already_started = true;
 
@@ -289,21 +282,19 @@ convert_script_sync_cb(hlcache_handle *script,
 		/* continue parse */
 		err = dom_hubbub_parser_pause(parent->parser, false);
 		if (err != DOM_HUBBUB_OK) {
-			LOG(("unpause returned 0x%x", err));
+			LOG("unpause returned 0x%x", err);
 		} 
 
 		break;
 
 	case CONTENT_MSG_ERROR:
-		LOG(("script %s failed: %s",
-				nsurl_access(hlcache_handle_get_url(script)),
-				event->data.error));
+		LOG("script %s failed: %s", nsurl_access(hlcache_handle_get_url(script)), event->data.error);
 
 		hlcache_handle_release(script);
 		s->data.handle = NULL;
 		parent->base.active--;
 
-		LOG(("%d fetches active", parent->base.active));
+		LOG("%d fetches active", parent->base.active);
 		content_add_error(&parent->base, "?", 0);
 
 		s->already_started = true;
@@ -311,7 +302,7 @@ convert_script_sync_cb(hlcache_handle *script,
 		/* continue parse */
 		err = dom_hubbub_parser_pause(parent->parser, false);
 		if (err != DOM_HUBBUB_OK) {
-			LOG(("unpause returned 0x%x", err));
+			LOG("unpause returned 0x%x", err);
 		} 
 
 		break;
@@ -359,7 +350,7 @@ exec_src_script(html_content *c,
 		return DOM_HUBBUB_NOMEM;
 	}
 
-	LOG(("script %i '%s'", c->scripts_count, nsurl_access(joined)));
+	LOG("script %i '%s'", c->scripts_count, nsurl_access(joined));
 
 	/* there are three ways to process the script tag at this point:
 	 *
@@ -438,11 +429,11 @@ exec_src_script(html_content *c,
 		 */
 		/* mark duff script fetch as already started */
 		nscript->already_started = true; 
-		LOG(("Fetch failed with error %d",ns_error));
+		LOG("Fetch failed with error %d", ns_error);
 	} else {
 		/* update base content active fetch count */
 		c->base.active++; 
-		LOG(("%d fetches active", c->base.active));
+		LOG("%d fetches active", c->base.active);
 
 		switch (script_type) {
 		case HTML_SCRIPT_SYNC:
@@ -524,14 +515,14 @@ html_process_script(void *ctx, dom_node *node)
 
 		msg_data.jscontext = &c->jscontext;
 		content_broadcast(&c->base, CONTENT_MSG_GETCTX, msg_data);
-		LOG(("javascript context %p ", c->jscontext));
+		LOG("javascript context %p ", c->jscontext);
 		if (c->jscontext == NULL) {
 			/* no context and it could not be created, abort */
 			return DOM_HUBBUB_OK;
 		}
 	}
 
-	LOG(("content %p parser %p node %p", c, c->parser, node));
+	LOG("content %p parser %p node %p", c, c->parser, node);
 
 	exc = dom_element_get_attribute(node, corestring_dom_type, &mimetype);
 	if (exc != DOM_NO_ERR || mimetype == NULL) {