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, 14 insertions, 26 deletions

diff --git a/riscos/toolbar.c b/riscos/toolbar.c
index 757513c88..b6e1d917e 100644
--- a/riscos/toolbar.c
+++ b/riscos/toolbar.c
@@ -231,7 +231,7 @@ struct toolbar *ro_toolbar_create(struct theme_descriptor *descriptor,
 
 	toolbar = calloc(sizeof(struct toolbar), 1);
 	if (toolbar == NULL) {
-		LOG(("No memory for malloc()"));
+		LOG("No memory for malloc()");
 		warn_user("NoMemory", 0);
 		return NULL;
 	}
@@ -370,8 +370,7 @@ bool ro_toolbar_rebuild(struct toolbar *toolbar)
 		old_window = toolbar->toolbar_handle;
 		error = xwimp_delete_window(toolbar->toolbar_handle);
 		if (error)
-			LOG(("xwimp_delete_window: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess);
 		toolbar->toolbar_handle = NULL;
 	}
 
@@ -380,8 +379,7 @@ bool ro_toolbar_rebuild(struct toolbar *toolbar)
 	error = xwimp_create_window(&ro_toolbar_window,
 			&toolbar->toolbar_handle);
 	if (error) {
-		LOG(("xwimp_create_window: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 		return false;
 	}
@@ -499,8 +497,7 @@ bool ro_toolbar_rebuild(struct toolbar *toolbar)
 		icon.icon.data.indirected_text.size = 1;
 		error = xwimp_create_icon(&icon, &toolbar->editor_div1);
 		if (error) {
-			LOG(("xwimp_create_icon: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 			toolbar->editor_div1 = -1;
 		}
@@ -565,8 +562,7 @@ bool ro_toolbar_attach(struct toolbar *toolbar, wimp_w parent)
 				wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT
 						<< wimp_CHILD_TS_EDGE_SHIFT);
 		if (error) {
-			LOG(("xwimp_open_window_nested: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -576,8 +572,7 @@ bool ro_toolbar_attach(struct toolbar *toolbar, wimp_w parent)
 
 	error = xwimp_close_window(toolbar->toolbar_handle);
 	if (error) {
-		LOG(("xwimp_close_window: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 		return false;
 	}
@@ -610,8 +605,7 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat)
 		outline.w = toolbar->parent_handle;
 		error = xwimp_get_window_outline(&outline);
 		if (error) {
-			LOG(("xwimp_get_window_outline: 0x%x: %s",
-				error->errnum, error->errmess));
+			LOG("xwimp_get_window_outline: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -631,8 +625,7 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat)
 		state.w = toolbar->parent_handle;
 		error = xwimp_get_window_state(&state);
 		if (error) {
-			LOG(("xwimp_get_window_state: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -658,8 +651,7 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat)
 			error = xwimp_set_extent(toolbar->toolbar_handle,
 					&extent);
 			if (error) {
-				LOG(("xwimp_get_window_state: 0x%x: %s",
-						error->errnum, error->errmess));
+				LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
 				warn_user("WimpError", error->errmess);
 			}
 
@@ -947,7 +939,7 @@ void ro_toolbar_destroy(struct toolbar *toolbar)
 	if (toolbar == NULL)
 		return;
 
-	LOG(("Destroying toolbar 0x%x", (unsigned int) toolbar));
+	LOG("Destroying toolbar 0x%x", (unsigned int)toolbar);
 
 	/* Destroy the widgets. */
 
@@ -1006,8 +998,7 @@ void ro_toolbar_redraw(wimp_draw *redraw)
 
 	error = xwimp_redraw_window(redraw, &more);
 	if (error) {
-		LOG(("xwimp_redraw_window: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 		return;
 	}
@@ -1026,8 +1017,7 @@ void ro_toolbar_redraw(wimp_draw *redraw)
 
 		error = xwimp_get_rectangle(redraw, &more);
 		if (error) {
-			LOG(("xwimp_get_rectangle: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 			return;
 		}
@@ -1060,8 +1050,7 @@ bool ro_toolbar_click(wimp_pointer *pointer)
 	state.w = toolbar->toolbar_handle;
 	error = xwimp_get_window_state(&state);
 	if (error) {
-		LOG(("xwimp_get_window_state: 0x%x: %s",
-			error->errnum, error->errmess));
+		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 		return false;
 	}
@@ -1340,8 +1329,7 @@ const char *ro_toolbar_get_help_suffix(wimp_w w, wimp_i i, os_coord *pos,
 	state.w = toolbar->toolbar_handle;
 	error = xwimp_get_window_state(&state);
 	if (error) {
-		LOG(("xwimp_get_window_state: 0x%x: %s",
-			error->errnum, error->errmess));
+		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 		return NULL;
 	}