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, 20 insertions, 41 deletions

diff --git a/riscos/url_complete.c b/riscos/url_complete.c
index c4d689654..3d189a01d 100644
--- a/riscos/url_complete.c
+++ b/riscos/url_complete.c
@@ -168,8 +168,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key)
 				-(url_complete_matches_selection + 1) * 44,
 				65536, -url_complete_matches_selection * 44);
 		if (error) {
-			LOG(("xwimp_force_redraw: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 		}
 
@@ -208,8 +207,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key)
 		state.w = parent;
 		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;
 		}
@@ -227,9 +225,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key)
 				error = xwimp_force_redraw(dialog_url_complete,
 					0, -(i + 1) * 44, 65536, -i * 44);
 				if (error) {
-					LOG(("xwimp_force_redraw: 0x%x: %s",
-							error->errnum,
-							error->errmess));
+					LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
 					warn_user("WimpError",
 							error->errmess);
 				}
@@ -282,8 +278,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key)
 			0, -(old_selection + 1) * 44,
 			65536, -old_selection * 44);
 	if (error) {
-		LOG(("xwimp_force_redraw: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 	}
 
@@ -291,8 +286,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key)
 			0, -(url_complete_matches_selection + 1) * 44,
 			65536, -url_complete_matches_selection * 44);
 	if (error) {
-		LOG(("xwimp_force_redraw: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 	}
 
@@ -323,8 +317,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key)
 	state.w = dialog_url_complete;
 	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 true;
 	}
@@ -339,8 +332,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key)
 
 	error = xwimp_open_window(PTR_WIMP_OPEN(&state));
 	if (error) {
-		LOG(("xwimp_open_window: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 		return true;
 	}
@@ -416,8 +408,7 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open)
 	state.w = dialog_url_complete;
 	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;
 	}
@@ -429,14 +420,13 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open)
 	toolbar_state.w = ro_toolbar_get_window(toolbar);
 	error = xwimp_get_window_state(&toolbar_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;
 	}
 
 	if (!ro_toolbar_get_url_field_extent(toolbar, &url_extent)) {
-		LOG(("Failed to read URL field extent."));
+		LOG("Failed to read URL field extent.");
 		return;
 	}
 
@@ -445,8 +435,7 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open)
 	extent.x1 = 65536;
 	error = xwimp_set_extent(dialog_url_complete, &extent);
 	if (error) {
-		LOG(("xwimp_set_extent: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess);
 		warn_user("WimpError", error->errmess);
 		return;
 	}
@@ -468,16 +457,14 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open)
 	if (state.visible.x1 - state.visible.x0 < 0) {
 		error = xwimp_close_window(dialog_url_complete);
 		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);
 		}
 	} else {
 		error = xwimp_open_window_nested_with_flags(&state,
 				(wimp_w)-1, 0);
 		if (error) {
-			LOG(("xwimp_open_window: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 			return;
 		}
@@ -517,8 +504,7 @@ bool ro_gui_url_complete_close(void)
 
 	error = xwimp_close_window(dialog_url_complete);
 	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);
 	}
 
@@ -558,7 +544,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw)
 
 	/* no matches? no redraw */
 	if (!url_complete_matches) {
-		LOG(("Attempt to redraw with no matches made"));
+		LOG("Attempt to redraw with no matches made");
 		/* Fill is never used, so make it something obvious */
 		ro_gui_user_redraw(redraw, false, os_COLOUR_BLACK);
 		return;
@@ -593,9 +579,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw)
 
 			error = xwimp_plot_icon(&url_complete_icon);
 			if (error) {
-				LOG(("xwimp_plot_icon: 0x%x: %s",
-						error->errnum,
-						error->errmess));
+				LOG("xwimp_plot_icon: 0x%x: %s", error->errnum, error->errmess);
 				warn_user("WimpError", error->errmess);
 			}
 
@@ -617,9 +601,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw)
 			url_complete_sprite.extent.y0 = -(line + 1) * 44;
 			error = xwimp_plot_icon(&url_complete_sprite);
 			if (error) {
-				LOG(("xwimp_plot_icon: 0x%x: %s",
-						error->errnum,
-						error->errmess));
+				LOG("xwimp_plot_icon: 0x%x: %s", error->errnum, error->errmess);
 				warn_user("WimpError", error->errmess);
 			}
 		}
@@ -673,8 +655,7 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer)
 	state.w = dialog_url_complete;
 	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;
 	}
@@ -701,16 +682,14 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer)
 				0, -(old_selection + 1) * 44,
 				65536, -old_selection * 44);
 		if (error) {
-			LOG(("xwimp_force_redraw: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 		}
 		error = xwimp_force_redraw(dialog_url_complete,
 				0, -(url_complete_matches_selection + 1) * 44,
 				65536, -url_complete_matches_selection * 44);
 		if (error) {
-			LOG(("xwimp_force_redraw: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
 			warn_user("WimpError", error->errmess);
 		}
 	}