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

5 files changed, 116 insertions, 53 deletions

diff --git a/frontends/riscos/gui/button_bar.c b/frontends/riscos/gui/button_bar.c
index 6ecd7cffa..34ae39ae5 100644
--- a/frontends/riscos/gui/button_bar.c
+++ b/frontends/riscos/gui/button_bar.c
@@ -138,7 +138,7 @@ struct button_bar *ro_gui_button_bar_create(struct theme_descriptor *theme,
 
 	button_bar = malloc(sizeof(struct button_bar));
 	if (button_bar == NULL) {
-		LOG("No memory for malloc()");
+		NSLOG(netsurf, INFO, "No memory for malloc()");
 		return NULL;
 	}
 
@@ -538,7 +538,10 @@ bool ro_gui_button_bar_icon_update(struct button_bar *button_bar)
 
 			error = xwimp_create_icon(&icon, &button->icon);
 			if (error) {
-				LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess);
+				NSLOG(netsurf, INFO,
+				      "xwimp_create_icon: 0x%x: %s",
+				      error->errnum,
+				      error->errmess);
 				ro_warn_user("WimpError", error->errmess);
 				button->icon = -1;
 				return false;
@@ -548,7 +551,10 @@ bool ro_gui_button_bar_icon_update(struct button_bar *button_bar)
 			error = xwimp_delete_icon(button_bar->window,
 					button->icon);
 			if (error != NULL) {
-				LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess);
+				NSLOG(netsurf, INFO,
+				      "xwimp_delete_icon: 0x%x: %s",
+				      error->errnum,
+				      error->errmess);
 				ro_warn_user("WimpError", error->errmess);
 				return false;
 			}
@@ -598,7 +604,10 @@ bool ro_gui_button_bar_icon_resize(struct button_bar *button_bar)
 						button->y_pos +
 						button->y_size);
 			if (error != NULL) {
-				LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess);
+				NSLOG(netsurf, INFO,
+				      "xwimp_resize_icon: 0x%x: %s",
+				      error->errnum,
+				      error->errmess);
 				ro_warn_user("WimpError", error->errmess);
 				button->icon = -1;
 				return false;
@@ -769,7 +778,10 @@ bool ro_gui_button_bar_click(struct button_bar *button_bar,
 					button_bar->sprites,
 					sprite, &box, NULL);
 			if (error)
-				LOG("xdragasprite_start: 0x%x: %s", error->errnum, error->errmess);
+				NSLOG(netsurf, INFO,
+				      "xdragasprite_start: 0x%x: %s",
+				      error->errnum,
+				      error->errmess);
 
 			ro_mouse_drag_start(ro_gui_button_bar_drag_end,
 					NULL, NULL, NULL);
@@ -870,7 +882,8 @@ void ro_gui_button_bar_drag_end(wimp_dragged *drag, void *data)
 
 	error = xwimp_get_pointer_info(&pointer);
 	if (error) {
-		LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_pointer_info: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
@@ -880,7 +893,8 @@ void ro_gui_button_bar_drag_end(wimp_dragged *drag, void *data)
 	state.w = drag_start->window;
 	error = xwimp_get_window_state(&state);
 	if (error) {
-		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_window_state: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
@@ -1068,7 +1082,7 @@ char *ro_gui_button_bar_get_config(struct button_bar *button_bar)
 
 	config = malloc(size);
 	if (config == NULL) {
-		LOG("No memory for malloc()");
+		NSLOG(netsurf, INFO, "No memory for malloc()");
 		ro_warn_user("NoMemory", 0);
 		return NULL;
 	}
diff --git a/frontends/riscos/gui/progress_bar.c b/frontends/riscos/gui/progress_bar.c
index c47c2af7d..06d89dbf4 100644
--- a/frontends/riscos/gui/progress_bar.c
+++ b/frontends/riscos/gui/progress_bar.c
@@ -137,7 +137,8 @@ struct progress_bar *ro_gui_progress_bar_create(void)
 	error = xwimp_create_window((wimp_window *)&progress_bar_definition,
 				&pb->w);
 	if (error) {
-		LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+		      error->errnum, error->errmess);
 		free(pb);
 		return NULL;
 	}
@@ -165,7 +166,8 @@ void ro_gui_progress_bar_destroy(struct progress_bar *pb)
 	ro_gui_wimp_event_finalise(pb->w);
 	error = xwimp_delete_window(pb->w);
 	if (error) {
-		LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_delete_window: 0x%x:%s",
+		      error->errnum, error->errmess);
 	}
 
 	free(pb);
@@ -327,7 +329,8 @@ void ro_gui_progress_bar_update(struct progress_bar *pb, int width, int height)
 	redraw.box.x0 = cur.x1;
 	error = xwimp_update_window(&redraw, &more);
 	if (error) {
-		LOG("Error getting update window: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "Error getting update window: 0x%x: %s",
+		      error->errnum, error->errmess);
 		return;
 	}
 	if (more)
@@ -351,7 +354,8 @@ void ro_gui_progress_bar_redraw(wimp_draw *redraw)
 
 	error = xwimp_redraw_window(redraw, &more);
 	if (error) {
-		LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_redraw_window: 0x%x: %s",
+		      error->errnum, error->errmess);
 		return;
 	}
 	if (more)
@@ -385,7 +389,8 @@ void ro_gui_progress_bar_animate(void *p)
 	redraw.box = pb->visible;
 	error = xwimp_update_window(&redraw, &more);
 	if (error != NULL) {
-		LOG("Error getting update window: '%s'", error->errmess);
+		NSLOG(netsurf, INFO, "Error getting update window: '%s'",
+		      error->errmess);
 		return;
 	}
 	if (more)
@@ -533,7 +538,8 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw,
 		}
 		error = xwimp_get_rectangle(redraw, &more);
 		if (error) {
-			LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_get_rectangle: 0x%x: %s",
+			      error->errnum, error->errmess);
 			return;
 		}
 	}
diff --git a/frontends/riscos/gui/status_bar.c b/frontends/riscos/gui/status_bar.c
index bcaf3baf9..dd1aab639 100644
--- a/frontends/riscos/gui/status_bar.c
+++ b/frontends/riscos/gui/status_bar.c
@@ -131,7 +131,8 @@ struct status_bar *ro_gui_status_bar_create(wimp_w parent, unsigned int width)
 	error = xwimp_create_window((wimp_window *)&status_bar_definition,
 				&sb->w);
 	if (error) {
-		LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+		      error->errnum, error->errmess);
 		free(sb);
 		return NULL;
 	}
@@ -165,7 +166,8 @@ void ro_gui_status_bar_destroy(struct status_bar *sb)
 	ro_gui_wimp_event_finalise(sb->w);
 	error = xwimp_delete_window(sb->w);
 	if (error) {
-		LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_delete_window: 0x%x:%s",
+		      error->errnum, error->errmess);
 	}
 
 	ro_gui_progress_bar_destroy(sb->pb);
@@ -222,7 +224,8 @@ void ro_gui_status_bar_set_visible(struct status_bar *sb, bool visible)
 	} else {
 		os_error *error = xwimp_close_window(sb->w);
 		if (error) {
-			LOG("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_close_window: 0x%x:%s",
+			      error->errnum, error->errmess);
 		}
 	}
 }
@@ -275,14 +278,15 @@ void ro_gui_status_bar_set_progress_range(struct status_bar *sb,
 	old_range = ro_gui_progress_bar_get_range(sb->pb);
 	ro_gui_progress_bar_set_range(sb->pb, range);
 
-	LOG("Ranges are %i vs %i", old_range, range);
+	NSLOG(netsurf, INFO, "Ranges are %i vs %i", old_range, range);
 	if ((old_range == 0) && (range != 0)) {
 		ro_gui_status_position_progress_bar(sb);
 	} else if ((old_range != 0) && (range == 0)) {
 		os_error *error = xwimp_close_window(
 				ro_gui_progress_bar_get_window(sb->pb));
 		if (error) {
-			LOG("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_close_window: 0x%x:%s",
+			      error->errnum, error->errmess);
 		}
 	}
 }
@@ -354,7 +358,8 @@ void ro_gui_status_bar_resize(struct status_bar *sb)
 	state.w = sb->parent;
 	error = xwimp_get_window_state(&state);
 	if (error) {
-		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_window_state: 0x%x: %s",
+		      error->errnum, error->errmess);
 		return;
 	}
 	window_width = state.visible.x1 - state.visible.x0;
@@ -377,7 +382,8 @@ void ro_gui_status_bar_resize(struct status_bar *sb)
 		extent.y1 = status_height - 4;
 		error = xwimp_set_extent(sb->w, &extent);
 		if (error) {
-			LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_set_extent: 0x%x: %s",
+			      error->errnum, error->errmess);
 			return;
 		}
 
@@ -405,7 +411,10 @@ void ro_gui_status_bar_resize(struct status_bar *sb)
 				wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
 						<< wimp_CHILD_TS_EDGE_SHIFT);
 		if (error) {
-			LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO,
+			      "xwimp_open_window_nested: 0x%x: %s",
+			      error->errnum,
+			      error->errmess);
 			return;
 		}
 		ro_gui_status_position_progress_bar(sb);
@@ -413,7 +422,8 @@ void ro_gui_status_bar_resize(struct status_bar *sb)
 				status_width - WIDGET_WIDTH, 0,
 				status_width, status_height - 4);
 		if (error) {
-			LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			return;
 		}
 
@@ -454,7 +464,8 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
 	/* redraw the window */
 	error = xwimp_redraw_window(redraw, &more);
 	if (error) {
-		LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_redraw_window: 0x%x: %s",
+		      error->errnum, error->errmess);
 		return;
 	}
 	while (more) {
@@ -463,7 +474,10 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
 			error = xcolourtrans_set_font_colours(font_CURRENT,
 					0xeeeeee00, 0x00000000, 14, 0, 0, 0);
 			if (error) {
-				LOG("xcolourtrans_set_font_colours: 0x%x: %s", error->errnum, error->errmess);
+				NSLOG(netsurf, INFO,
+				      "xcolourtrans_set_font_colours: 0x%x: %s",
+				      error->errnum,
+				      error->errmess);
 				return;
 			}
 			code = rufl_paint(ro_gui_desktop_font_family,
@@ -474,10 +488,13 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
 					rufl_BLEND_FONT);
 			if (code != rufl_OK) {
 				if (code == rufl_FONT_MANAGER_ERROR)
-					LOG("rufl_FONT_MANAGER_ERROR: 0x%x: %s",
-					    rufl_fm_error->errnum, rufl_fm_error->errmess);
+					NSLOG(netsurf, INFO,
+					      "rufl_FONT_MANAGER_ERROR: 0x%x: %s",
+					      rufl_fm_error->errnum,
+					      rufl_fm_error->errmess);
 				else
-					LOG("rufl_paint: 0x%x", code);
+					NSLOG(netsurf, INFO,
+					      "rufl_paint: 0x%x", code);
 			}
 		}
 
@@ -493,7 +510,8 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
 
 		error = xwimp_get_rectangle(redraw, &more);
 		if (error) {
-			LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_get_rectangle: 0x%x: %s",
+			      error->errnum, error->errmess);
 			return;
 		}
 	}
@@ -532,7 +550,10 @@ bool ro_gui_status_bar_click(wimp_pointer *pointer)
 			drag.initial.y1 = pointer->pos.y;
 			error = xwimp_drag_box(&drag);
 			if (error) {
-				LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess);
+				NSLOG(netsurf, INFO,
+				      "xwimp_drag_box: 0x%x: %s",
+				      error->errnum,
+				      error->errmess);
 			}
 			break;
 	}
@@ -557,7 +578,8 @@ void ro_gui_status_bar_open(wimp_open *open)
 	state.w = sb->parent;
 	error = xwimp_get_window_state(&state);
 	if (error) {
-		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_window_state: 0x%x: %s",
+		      error->errnum, error->errmess);
 		return;
 	}
 	window_width = state.visible.x1 - state.visible.x0;
@@ -596,7 +618,8 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb)
 	state.w = sb->w;
 	error = xwimp_get_window_state(&state);
 	if (error) {
-		LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_window_state: 0x%x: %s",
+		      error->errnum, error->errmess);
 		return;
 	}
 
@@ -626,7 +649,8 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb)
 			wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
 					<< wimp_CHILD_TS_EDGE_SHIFT);
 	if (error) {
-		LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_open_window: 0x%x: %s",
+		      error->errnum, error->errmess);
 	}
 
 	/* update the progress bar display on non-standard width */
diff --git a/frontends/riscos/gui/throbber.c b/frontends/riscos/gui/throbber.c
index a326f806c..f3b79a68e 100644
--- a/frontends/riscos/gui/throbber.c
+++ b/frontends/riscos/gui/throbber.c
@@ -81,7 +81,7 @@ struct throbber *ro_gui_throbber_create(struct theme_descriptor *theme)
 
 	throbber = malloc(sizeof(struct throbber));
 	if (throbber == NULL) {
-		LOG("No memory for malloc()");
+		NSLOG(netsurf, INFO, "No memory for malloc()");
 		return NULL;
 	}
 
@@ -248,7 +248,8 @@ bool ro_gui_throbber_icon_update(struct throbber *throbber)
 
 		error = xwimp_create_icon(&icon, &throbber->icon);
 		if (error != NULL) {
-			LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_create_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			throbber->icon = -1;
 			return false;
@@ -259,7 +260,8 @@ bool ro_gui_throbber_icon_update(struct throbber *throbber)
 	} else if (throbber->hidden && throbber->icon != -1) {
 		error = xwimp_delete_icon(throbber->window, throbber->icon);
 		if (error != NULL) {
-			LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_delete_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -295,7 +297,8 @@ bool ro_gui_throbber_icon_resize(struct throbber *throbber)
 				throbber->extent.x0, throbber->extent.y0,
 				throbber->extent.x1, throbber->extent.y1);
 		if (error != NULL) {
-			LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			throbber->icon = -1;
 			return false;
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index a5ec3f8c6..ee5c689df 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -140,7 +140,7 @@ struct url_bar *ro_gui_url_bar_create(struct theme_descriptor *theme)
 
 	url_bar = malloc(sizeof(struct url_bar));
 	if (url_bar == NULL) {
-		LOG("No memory for malloc()");
+		NSLOG(netsurf, INFO, "No memory for malloc()");
 		return NULL;
 	}
 
@@ -240,7 +240,8 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full)
 				url_bar->container_icon,
 				x0, y0, x1, y1);
 		if (error != NULL) {
-			LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			url_bar->container_icon = -1;
 			return false;
@@ -260,7 +261,8 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full)
 				url_bar->suggest_icon,
 				x0, y0, x1, y1);
 		if (error != NULL) {
-			LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			url_bar->suggest_icon = -1;
 			return false;
@@ -281,7 +283,8 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full)
 				url_bar->text_icon,
 				x0, y0, x1, y1);
 		if (error != NULL) {
-			LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			url_bar->text_icon = -1;
 			return false;
@@ -362,7 +365,8 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
 						wimp_ICON_BUTTON_TYPE_SHIFT);
 		error = xwimp_create_icon(&icon, &url_bar->container_icon);
 		if (error != NULL) {
-			LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_create_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			url_bar->container_icon = -1;
 			return false;
@@ -373,7 +377,8 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
 		error = xwimp_delete_icon(url_bar->window,
 				url_bar->container_icon);
 		if (error != NULL) {
-			LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_delete_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -399,7 +404,8 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
 					wimp_ICON_BUTTON_TYPE_SHIFT);
 		error = xwimp_create_icon(&icon, &url_bar->text_icon);
 		if (error) {
-			LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_create_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			url_bar->text_icon = -1;
 			return false;
@@ -410,7 +416,8 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
 		error = xwimp_delete_icon(url_bar->window,
 				url_bar->text_icon);
 		if (error != NULL) {
-			LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_delete_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -430,7 +437,8 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
 				wimp_ICON_BUTTON_TYPE_SHIFT);
 		error = xwimp_create_icon(&icon, &url_bar->suggest_icon);
 		if (error) {
-			LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_create_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -450,7 +458,8 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
 		error = xwimp_delete_icon(url_bar->window,
 				url_bar->suggest_icon);
 		if (error != NULL) {
-			LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_delete_icon: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 			return false;
 		}
@@ -940,7 +949,8 @@ bool ro_gui_url_bar_take_caret(struct url_bar *url_bar)
 	error = xwimp_set_caret_position(url_bar->window, url_bar->text_icon,
 			-1, -1, -1, 0);
 	if (error) {
-		LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_set_caret_position: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("WimpError", error->errmess);
 
 		return false;
@@ -977,7 +987,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url,
 		if (err != NSERROR_OK) {
 			/* A bad encoding should never happen, so assert this */
 			assert(err != NSERROR_BAD_ENCODING);
-			LOG("utf8_to_enc failed");
+			NSLOG(netsurf, INFO, "utf8_to_enc failed");
 			/* Paranoia */
 			local_text = NULL;
 		}
@@ -993,7 +1003,8 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url,
 	if (strlen(local_url) >= url_bar->text_size) {
 		url_bar->text_buffer[0] = '\0';
 		ro_warn_user("LongURL", NULL);
-		LOG("Long URL (%zu chars): %s", strlen(url), url);
+		NSLOG(netsurf, INFO, "Long URL (%zu chars): %s", strlen(url),
+		      url);
 	} else {
 		strncpy(url_bar->text_buffer, local_url,
 				url_bar->text_size - 1);
@@ -1021,7 +1032,8 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url,
 
 	error = xwimp_get_caret_position(&caret);
 	if (error) {
-		LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_caret_position: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("WimpError", error->errmess);
 		return;
 	}
@@ -1034,7 +1046,10 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url,
 		error = xwimp_set_caret_position(url_bar->window,
 				url_bar->text_icon, 0, 0, -1, strlen(set_url));
 		if (error) {
-			LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO,
+			      "xwimp_set_caret_position: 0x%x: %s",
+			      error->errnum,
+			      error->errmess);
 			ro_warn_user("WimpError", error->errmess);
 		}
 	}
@@ -1123,7 +1138,8 @@ bool ro_gui_url_bar_get_url_extent(struct url_bar *url_bar, os_box *extent)
 	state.i = url_bar->container_icon;
 	error = xwimp_get_icon_state(&state);
 	if (error) {
-		LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_icon_state: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("WimpError", error->errmess);
 		return false;
 	}