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

1 files changed, 20 insertions, 11 deletions

diff --git a/frontends/riscos/menus.c b/frontends/riscos/menus.c
index d46afa28e..a6e978a6c 100644
--- a/frontends/riscos/menus.c
+++ b/frontends/riscos/menus.c
@@ -232,7 +232,8 @@ void ro_gui_menu_create(wimp_menu *menu, int x, int y, wimp_w w)
 	current_menu_open = true;
 	error = xwimp_create_menu(menu, x - 64, y);
 	if (error) {
-		LOG("xwimp_create_menu: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_create_menu: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("MenuError", error->errmess);
 		ro_gui_menu_closed();
 	}
@@ -258,14 +259,16 @@ void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i)
 	icon_state.i = i;
 	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("MenuError", error->errmess);
 		return;
 	}
 
 	error = xwimp_get_icon_state(&icon_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("MenuError", error->errmess);
 		return;
 	}
@@ -291,7 +294,8 @@ void ro_gui_menu_destroy(void)
 
 	error = xwimp_create_menu(wimp_CLOSE_MENU, 0, 0);
 	if (error) {
-		LOG("xwimp_create_menu: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_create_menu: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("MenuError", error->errmess);
 	}
 
@@ -354,7 +358,8 @@ void ro_gui_menu_selection(wimp_selection *selection)
 	/* re-open the menu for Adjust clicks */
 	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);
 		ro_gui_menu_closed();
 		return;
@@ -420,7 +425,8 @@ void ro_gui_menu_warning(wimp_message_menu_warning *warning)
 	error = xwimp_create_sub_menu(menu_entry->sub_menu,
 			warning->pos.x, warning->pos.y);
 	if (error) {
-		LOG("xwimp_create_sub_menu: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_create_sub_menu: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("MenuError", error->errmess);
 	}
 }
@@ -485,7 +491,8 @@ void ro_gui_menu_refresh(wimp_menu *menu)
 		os_error *error;
 		error = xwimp_create_menu(current_menu, 0, 0);
 		if (error) {
-			LOG("xwimp_create_menu: 0x%x: %s", error->errnum, error->errmess);
+			NSLOG(netsurf, INFO, "xwimp_create_menu: 0x%x: %s",
+			      error->errnum, error->errmess);
 			ro_warn_user("MenuError", error->errmess);
 		}
 	}
@@ -851,7 +858,8 @@ int ro_gui_menu_get_checksum(void)
 	error = xwimp_get_menu_state((wimp_menu_state_flags)0,
 			&menu_tree, 0, 0);
 	if (error) {
-		LOG("xwimp_get_menu_state: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "xwimp_get_menu_state: 0x%x: %s",
+		      error->errnum, error->errmess);
 		ro_warn_user("MenuError", error->errmess);
 		return 0;
 	}
@@ -894,7 +902,8 @@ bool ro_gui_menu_translate(struct menu_definition *menu)
 	/* read current alphabet */
 	error = xosbyte1(osbyte_ALPHABET_NUMBER, 127, 0, &alphabet);
 	if (error) {
-		LOG("failed reading alphabet: 0x%x: %s", error->errnum, error->errmess);
+		NSLOG(netsurf, INFO, "failed reading alphabet: 0x%x: %s",
+		      error->errnum, error->errmess);
 		/* assume Latin1 */
 		alphabet = territory_ALPHABET_LATIN1;
 	}
@@ -909,7 +918,7 @@ bool ro_gui_menu_translate(struct menu_definition *menu)
 			0, &translated);
 	if (err != NSERROR_OK) {
 		assert(err != NSERROR_BAD_ENCODING);
-		LOG("utf8_to_enc failed");
+		NSLOG(netsurf, INFO, "utf8_to_enc failed");
 		return false;
 	}
 
@@ -926,7 +935,7 @@ bool ro_gui_menu_translate(struct menu_definition *menu)
 				0, &translated);
 		if (err != NSERROR_OK) {
 			assert(err != NSERROR_BAD_ENCODING);
-			LOG("utf8_to_enc failed");
+			NSLOG(netsurf, INFO, "utf8_to_enc failed");
 			return false;
 		}