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, 43 insertions, 70 deletions

diff --git a/riscos/textarea.c b/riscos/textarea.c
index bec6711b9..ecf3e0c3d 100644
--- a/riscos/textarea.c
+++ b/riscos/textarea.c
@@ -139,7 +139,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags,
 
 	ret = malloc(sizeof(struct text_area));
 	if (!ret) {
-		LOG(("malloc failed"));
+		LOG("malloc failed");
 		return 0;
 	}
 
@@ -149,7 +149,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags,
 	ret->flags = flags;
 	ret->text = malloc(64);
 	if (!ret->text) {
-		LOG(("malloc failed"));
+		LOG("malloc failed");
 		free(ret);
 		return 0;
 	}
@@ -161,7 +161,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags,
 //	ret->selection_end = (unsigned int)-1;
 	ret->font_family = strdup(font_family ? font_family : "Corpus");
 	if (!ret->font_family) {
-		LOG(("strdup failed"));
+		LOG("strdup failed");
 		free(ret->text);
 		free(ret);
 		return 0;
@@ -182,8 +182,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags,
 		text_area_definition.title_fg = wimp_COLOUR_BLACK;
 	error = xwimp_create_window(&text_area_definition, &ret->window);
 	if (error) {
-		LOG(("xwimp_create_window: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess);
 		free(ret->font_family);
 		free(ret->text);
 		free(ret);
@@ -230,8 +229,7 @@ bool ro_textarea_update(uintptr_t self)
 	state.w = ta->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);
 		return false;
 	}
 
@@ -239,8 +237,7 @@ bool ro_textarea_update(uintptr_t self)
 	istate.i = ta->icon;
 	error = xwimp_get_icon_state(&istate);
 	if (error) {
-		LOG(("xwimp_get_icon_state: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
 		return false;
 	}
 
@@ -271,8 +268,7 @@ bool ro_textarea_update(uintptr_t self)
 
 	error = xwimp_set_extent(ta->window, &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);
 		return false;
 	}
 
@@ -287,8 +283,7 @@ bool ro_textarea_update(uintptr_t self)
 			wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
 					<< wimp_CHILD_RS_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);
 		return false;
 	}
 
@@ -313,8 +308,7 @@ void ro_textarea_destroy(uintptr_t self)
 
 	error = xwimp_delete_window(ta->window);
 	if (error) {
-		LOG(("xwimp_delete_window: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess);
 	}
 
 	ro_gui_wimp_event_finalise(ta->window);
@@ -338,14 +332,14 @@ bool ro_textarea_set_text(uintptr_t self, const char *text)
 
 	ta = (struct text_area *)self;
 	if (!ta || ta->magic != MAGIC) {
-		LOG(("magic doesn't match"));
+		LOG("magic doesn't match");
 		return true;
 	}
 
 	if (len >= ta->text_alloc) {
 		char *temp = realloc(ta->text, len + 64);
 		if (!temp) {
-			LOG(("realloc failed"));
+			LOG("realloc failed");
 			return false;
 		}
 		ta->text = temp;
@@ -375,7 +369,7 @@ int ro_textarea_get_text(uintptr_t self, char *buf, unsigned int len)
 
 	ta = (struct text_area *)self;
 	if (!ta || ta->magic != MAGIC) {
-		LOG(("magic doesn't match"));
+		LOG("magic doesn't match");
 		return -1;
 	}
 
@@ -385,7 +379,7 @@ int ro_textarea_get_text(uintptr_t self, char *buf, unsigned int len)
 	}
 
 	if (len < ta->text_len) {
-		LOG(("buffer too small"));
+		LOG("buffer too small");
 		return -1;
 	}
 
@@ -410,7 +404,7 @@ void ro_textarea_insert_text(uintptr_t self, unsigned int index,
 
 	ta = (struct text_area *)self;
 	if (!ta || ta->magic != MAGIC) {
-		LOG(("magic doesn't match"));
+		LOG("magic doesn't match");
 		return;
 	}
 
@@ -427,7 +421,7 @@ void ro_textarea_insert_text(uintptr_t self, unsigned int index,
 	if (b_len + ta->text_len >= ta->text_alloc) {
 		char *temp = realloc(ta->text, b_len + ta->text_len + 64);
 		if (!temp) {
-			LOG(("realloc failed"));
+			LOG("realloc failed");
 			return;
 		}
 
@@ -464,7 +458,7 @@ void ro_textarea_replace_text(uintptr_t self, unsigned int start,
 
 	ta = (struct text_area *)self;
 	if (!ta || ta->magic != MAGIC) {
-		LOG(("magic doesn't match"));
+		LOG("magic doesn't match");
 		return;
 	}
 
@@ -498,7 +492,7 @@ void ro_textarea_replace_text(uintptr_t self, unsigned int start,
 		char *temp = realloc(ta->text,
 			b_len + ta->text_len - (b_end - b_start) + 64);
 		if (!temp) {
-			LOG(("realloc failed"));
+			LOG("realloc failed");
 			return;
 		}
 
@@ -539,7 +533,7 @@ void ro_textarea_set_caret(uintptr_t self, unsigned int caret)
 
 	ta = (struct text_area *)self;
 	if (!ta || ta->magic != MAGIC) {
-		LOG(("magic doesn't match"));
+		LOG("magic doesn't match");
 		return;
 	}
 
@@ -581,11 +575,9 @@ void ro_textarea_set_caret(uintptr_t self, unsigned int caret)
 			b_off - ta->lines[ta->caret_pos.line].b_start, &x);
 	if (code != rufl_OK) {
 		if (code == rufl_FONT_MANAGER_ERROR)
-			LOG(("rufl_width: 0x%x: %s",
-				rufl_fm_error->errnum,
-				rufl_fm_error->errmess));
+			LOG("rufl_width: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess);
 		else
-			LOG(("rufl_width: 0x%x", code));
+			LOG("rufl_width: 0x%x", code);
 		return;
 	}
 
@@ -594,8 +586,7 @@ void ro_textarea_set_caret(uintptr_t self, unsigned int caret)
 				ta->line_height / 4 + ta->line_spacing,
 			os_line_height.y, -1);
 	if (error) {
-		LOG(("xwimp_set_caret_position: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
 		return;
 	}
 }
@@ -619,7 +610,7 @@ void ro_textarea_set_caret_xy(uintptr_t self, int x, int y)
 
 	ta = (struct text_area *)self;
 	if (!ta || ta->magic != MAGIC) {
-		LOG(("magic doesn't match"));
+		LOG("magic doesn't match");
 		return;
 	}
 
@@ -633,8 +624,7 @@ void ro_textarea_set_caret_xy(uintptr_t self, int x, int y)
 	state.w = ta->window;
 	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);
 		return;
 	}
 
@@ -655,11 +645,9 @@ void ro_textarea_set_caret_xy(uintptr_t self, int x, int y)
 			x, &b_off, &x);
 	if (code != rufl_OK) {
 		if (code == rufl_FONT_MANAGER_ERROR)
-			LOG(("rufl_x_to_offset: 0x%x: %s",
-					rufl_fm_error->errnum,
-					rufl_fm_error->errmess));
+			LOG("rufl_x_to_offset: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess);
 		else
-			LOG(("rufl_x_to_offset: 0x%x", code));
+			LOG("rufl_x_to_offset: 0x%x", code);
 		return;
 	}
 
@@ -683,7 +671,7 @@ unsigned int ro_textarea_get_caret(uintptr_t self)
 
 	ta = (struct text_area *)self;
 	if (!ta || ta->magic != MAGIC) {
-		LOG(("magic doesn't match"));
+		LOG("magic doesn't match");
 		return -1;
 	}
 
@@ -724,7 +712,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line)
 		ta->lines =
 			malloc(LINE_CHUNK_SIZE * sizeof(struct line_info));
 		if (!ta->lines) {
-			LOG(("malloc failed"));
+			LOG("malloc failed");
 			return;
 		}
 	}
@@ -747,11 +735,9 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line)
 				&b_off, &x);
 		if (code != rufl_OK) {
 			if (code == rufl_FONT_MANAGER_ERROR)
-				LOG(("rufl_x_to_offset: 0x%x: %s",
-						rufl_fm_error->errnum,
-						rufl_fm_error->errmess));
+				LOG("rufl_x_to_offset: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess);
 			else
-				LOG(("rufl_x_to_offset: 0x%x", code));
+				LOG("rufl_x_to_offset: 0x%x", code);
 			return;
 		}
 
@@ -760,7 +746,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line)
 					(line_count + LINE_CHUNK_SIZE) *
 					sizeof(struct line_info));
 			if (!temp) {
-				LOG(("realloc failed"));
+				LOG("realloc failed");
 				return;
 			}
 
@@ -824,8 +810,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line)
 
 	error = xwimp_set_extent(ta->window, &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);
 		return;
 	}
 
@@ -842,8 +827,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line)
 		error = xwimp_get_window_state_and_nesting(&state,
 				&parent, &linkage);
 		if (error) {
-			LOG(("xwimp_get_window_state_and_nesting: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xwimp_get_window_state_and_nesting: 0x%x: %s", error->errnum, error->errmess);
 			return;
 		}
 
@@ -856,8 +840,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line)
 		state.w = ta->window;
 		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);
 			return;
 		}
 
@@ -871,8 +854,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line)
 		error = xwimp_open_window_nested(PTR_WIMP_OPEN(&state),
 				parent, linkage);
 		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);
 			return;
 		}
 
@@ -1028,8 +1010,7 @@ bool ro_textarea_key_press(wimp_key *key)
 					(wimp_message*)&keypress, ta->parent,
 					ta->icon, 0);
 			if (error) {
-				LOG(("xwimp_send_message: 0x%x:%s",
-					error->errnum, error->errmess));
+				LOG("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess);
 			}
 			break;
 		}
@@ -1080,8 +1061,7 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update)
 	else
 		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);
 		return;
 	}
 
@@ -1097,15 +1077,13 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update)
 				colourtrans_SET_BG_GCOL | colourtrans_USE_ECFS_GCOL,
 				os_ACTION_OVERWRITE, 0, 0);
 		if (error) {
-			LOG(("xcolourtrans_set_gcol: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess);
 			return;
 		}
 
 		error = xos_clg();
 		if (error) {
-			LOG(("xos_clg: 0x%x: %s",
-					error->errnum, error->errmess));
+			LOG("xos_clg: 0x%x: %s", error->errnum, error->errmess);
 			return;
 		}
 
@@ -1136,8 +1114,7 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update)
 						0xD9D9D900 : 0xFFFFFF00,
 					0x00000000, 14, 0, 0, 0);
 			if (error) {
-				LOG(("xcolourtrans_set_font_colours: 0x%x: %s",
-					error->errnum, error->errmess));
+				LOG("xcolourtrans_set_font_colours: 0x%x: %s", error->errnum, error->errmess);
 				return;
 			}
 
@@ -1152,18 +1129,15 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update)
 					rufl_BLEND_FONT);
 			if (code != rufl_OK) {
 				if (code == rufl_FONT_MANAGER_ERROR)
-					LOG(("rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s",
-						rufl_fm_error->errnum,
-						rufl_fm_error->errmess));
+					LOG("rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess);
 				else
-					LOG(("rufl_paint: 0x%x", code));
+					LOG("rufl_paint: 0x%x", code);
 			}
 		}
 
 		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);
 			return;
 		}
 	}
@@ -1180,8 +1154,7 @@ void ro_textarea_open(wimp_open *open)
 
 	error = xwimp_open_window(open);
 	if (error) {
-		LOG(("xwimp_open_window: 0x%x: %s",
-				error->errnum, error->errmess));
+		LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess);
 		return;
 	}
 }