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.

24 files changed, 154 insertions, 171 deletions

diff --git a/atari/bitmap.c b/atari/bitmap.c
index 431d97dc8..a159a6659 100644
--- a/atari/bitmap.c
+++ b/atari/bitmap.c
@@ -81,8 +81,7 @@ static void *atari_bitmap_create_ex( int w, int h, short bpp, int rowstride, uns
 {
     struct bitmap * bitmap;
 
-    LOG(("width %d (rowstride: %d, bpp: %d), height %d, state %u",w, rowstride,
-		bpp, h, state ));
+    LOG("width %d (rowstride: %d, bpp: %d), height %d, state %u", w, rowstride, bpp, h, state);
 
 	if( rowstride == 0) {
 		rowstride = bpp * w;
@@ -108,10 +107,10 @@ static void *atari_bitmap_create_ex( int w, int h, short bpp, int rowstride, uns
         } else {
 			free(bitmap);
 			bitmap=NULL;
-			LOG(("Out of memory!"));
+			LOG("Out of memory!");
 		}
 	}
-	LOG(("bitmap %p", bitmap));
+	LOG("bitmap %p", bitmap);
 	return bitmap;
 }
 
@@ -195,7 +194,7 @@ static unsigned char *bitmap_get_buffer(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return NULL;
 	}
 
@@ -219,7 +218,7 @@ size_t atari_bitmap_get_rowstride(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return 0;
 	}
 	return bm->rowstride;
@@ -232,7 +231,7 @@ void atari_bitmap_destroy(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return;
 	}
 
@@ -273,11 +272,11 @@ static void bitmap_set_opaque(void *bitmap, bool opaque)
 	struct bitmap *bm = bitmap;
 
     if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return;
 	}
 
-	LOG(("setting bitmap %p to %s", bm, opaque?"opaque":"transparent"));
+	LOG("setting bitmap %p to %s", bm, opaque ? "opaque" : "transparent");
     bm->opaque = opaque;
 }
 
@@ -294,7 +293,7 @@ static bool bitmap_test_opaque(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return false;
 	}
 
@@ -306,11 +305,11 @@ static bool bitmap_test_opaque(void *bitmap)
 
 	while (tst-- > 0) {
 		if (bm->pixdata[(tst << 2) + 3] != 0xff) {
-				LOG(("bitmap %p has transparency",bm));
+				LOG("bitmap %p has transparency", bm);
 					return false;
 		}
 	}
-	LOG(("bitmap %p is opaque", bm));
+	LOG("bitmap %p is opaque", bm);
 	return true;
 }
 
@@ -321,7 +320,7 @@ bool atari_bitmap_get_opaque(void *bitmap)
 	struct bitmap *bm = bitmap;
 
         if (bitmap == NULL) {
-                LOG(("NULL bitmap!"));
+                LOG("NULL bitmap!");
                 return false;
         }
 
@@ -335,7 +334,7 @@ int atari_bitmap_get_width(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return 0;
 	}
 
@@ -349,7 +348,7 @@ int atari_bitmap_get_height(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return 0;
 	}
 	return(bm->height);
diff --git a/atari/certview.c b/atari/certview.c
index c5d169a41..d649c02e5 100644
--- a/atari/certview.c
+++ b/atari/certview.c
@@ -84,7 +84,7 @@ static nserror atari_sslcert_viewer_init_phase2(struct core_window *cw,
 
 	assert(ssl_d);
 
-	LOG((""));
+	LOG("");
 
 	return(sslcert_viewer_init(cb_t, cw, ssl_d));
 }
@@ -100,7 +100,7 @@ static void atari_sslcert_viewer_finish(struct core_window *cw)
 	/* This will also free the session data: */
 	sslcert_viewer_fini(cvwin->ssl_session_data);
 
-	LOG((""));
+	LOG("");
 }
 
 static void atari_sslcert_viewer_draw(struct core_window *cw, int x,
@@ -126,7 +126,7 @@ static void atari_sslcert_viewer_keypress(struct core_window *cw, uint32_t ucs4)
 
 	cvwin = (struct atari_sslcert_viewer_s *)atari_treeview_get_user_data(cw);
 
-	LOG(("ucs4: %lu\n", ucs4));
+	LOG("ucs4: %lu\n", ucs4);
 	sslcert_viewer_keypress(cvwin->ssl_session_data, ucs4);
 }
 
@@ -153,14 +153,14 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 	short retval = 0;
 	OBJECT *toolbar;
 
-	LOG((""));
+	LOG("");
 
 	if(ev_out->emo_events & MU_MESAG){
 		switch (msg[0]) {
 
 		case WM_TOOLBAR:
 			toolbar = gemtk_obj_get_tree(TOOLBAR_SSL_CERT);
-			LOG(("CERTVIEWER WM_TOOLBAR"));
+			LOG("CERTVIEWER WM_TOOLBAR");
 			tv = (struct core_window*) gemtk_wm_get_user_data(win);
 			assert(tv);
 			cvwin = (struct atari_sslcert_viewer_s *)
@@ -241,7 +241,7 @@ static void atari_sslcert_viewer_init(struct atari_sslcert_viewer_s * cvwin,
 
 	if (cvwin->tv == NULL) {
 		/* handle it properly, clean up previous allocs */
-		LOG(("Failed to allocate treeview"));
+		LOG("Failed to allocate treeview");
 		return;
 	}
 
@@ -283,7 +283,7 @@ static void atari_sslcert_viewer_destroy(struct atari_sslcert_viewer_s * cvwin)
 	assert(cvwin->init);
 	assert(cvwin->window);
 
-	LOG((""));
+	LOG("");
 
 	if (atari_treeview_is_open(cvwin->tv))
 		atari_treeview_close(cvwin->tv);
@@ -292,5 +292,5 @@ static void atari_sslcert_viewer_destroy(struct atari_sslcert_viewer_s * cvwin)
 	cvwin->window = NULL;
 	atari_treeview_delete(cvwin->tv);
 	free(cvwin);
-	LOG(("done"));
+	LOG("done");
 }
diff --git a/atari/cookies.c b/atari/cookies.c
index 0d4704e27..4578f38a4 100644
--- a/atari/cookies.c
+++ b/atari/cookies.c
@@ -74,13 +74,13 @@ static struct atari_treeview_callbacks atari_cookie_manager_treeview_callbacks =
 static nserror atari_cookie_manager_init_phase2(struct core_window *cw,
 								struct core_window_callback_table *cb_t)
 {
-	LOG((""));
+	LOG("");
 	return(cookie_manager_init(cb_t, cw));
 }
 
 static void atari_cookie_manager_finish(struct core_window *cw)
 {
-	LOG((""));
+	LOG("");
 	cookie_manager_fini();
 }
 
@@ -93,7 +93,7 @@ static void atari_cookie_manager_draw(struct core_window *cw, int x,
 
 static void atari_cookie_manager_keypress(struct core_window *cw, uint32_t ucs4)
 {
-	LOG(("ucs4: %lu\n", ucs4));
+	LOG("ucs4: %lu\n", ucs4);
 	cookie_manager_keypress(ucs4);
 }
 
@@ -110,13 +110,13 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 {
 	short retval = 0;
 
-	LOG((""));
+	LOG("");
 
 	if(ev_out->emo_events & MU_MESAG){
 		switch (msg[0]) {
 
 			case WM_TOOLBAR:
-				LOG(("WM_TOOLBAR"));
+				LOG("WM_TOOLBAR");
 			break;
 
 			case WM_CLOSED:
@@ -160,7 +160,7 @@ void atari_cookie_manager_init(void)
 
 			if (atari_cookie_manager.tv == NULL) {
 				/* handle it properly, clean up previous allocs */
-				LOG(("Failed to allocate treeview"));
+				LOG("Failed to allocate treeview");
 				return;
 			}
 
@@ -211,7 +211,7 @@ void atari_cookie_manager_destroy(void)
 		atari_treeview_delete(atari_cookie_manager.tv);
 		atari_cookie_manager.init = false;
 	}
-	LOG(("done"));
+	LOG("done");
 
 }
 
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 4dc17016a..7106fabfe 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -302,7 +302,7 @@ void context_popup(struct gui_window * gw, short x, short y)
 				    /* the GEMDOS cmdline contains the length of the commandline
 				       in the first byte: */
 				    cmdline[0] = (unsigned char)strlen(tempfile);
-					LOG(("Creating temporay source file: %s\n", tempfile));
+					LOG("Creating temporay source file: %s\n", tempfile);
 					fp_tmpfile = fopen(tempfile, "w");
 					if (fp_tmpfile != NULL){
 						fwrite(data, size, 1, fp_tmpfile);
@@ -320,7 +320,7 @@ void context_popup(struct gui_window * gw, short x, short y)
 					}
 
 				} else {
-					LOG(("Invalid content!"));
+					LOG("Invalid content!");
 				}
 			} else {
 				form_alert(0, "[1][Set option \"atari_editor\".][OK]");
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 98bb02e64..eeffacea6 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -577,14 +577,14 @@ static void register_menu_str( struct s_menu_item_evnt * mi )
 	while (i > 2) {
 		if ((strncmp("  ", &str[i], 2) == 0) && (strlen(&str[i]) > 2)) {
 			// "Standard" Keyboard Shortcut Element found:
-			LOG(("Standard Keyboard Shortcut: \"%s\"\n", &str[i]));
+			LOG("Standard Keyboard Shortcut: \"%s\"\n", &str[i]);
 			x = i+2;
 			is_std_shortcut = true;
 			break;
 		}
 
 		if( str[i] == '['){
-			LOG(("Keyboard Shortcut: \"%s\"\n", &str[i]));
+			LOG("Keyboard Shortcut: \"%s\"\n", &str[i]);
 			// "Custom" Keyboard Shortcut Element found (identified by [):
 			x = i;
 			break;
@@ -659,9 +659,7 @@ static void register_menu_str( struct s_menu_item_evnt * mi )
 			}
 		}
 
-		LOG(("Registered keyboard shortcut for \"%s\" => mod: %d, "
-		     "keycode: %d, ascii: %c\n", str, accel->mod, accel->keycode,
-		     accel->ascii));
+		LOG("Registered keyboard shortcut for \"%s\" => mod: %d, ""keycode: %d, ascii: %c\n", str, accel->mod, accel->keycode, accel->ascii);
 	}
 }
 
diff --git a/atari/download.c b/atari/download.c
index 7445a837d..ce56d66d3 100644
--- a/atari/download.c
+++ b/atari/download.c
@@ -197,7 +197,7 @@ static void gui_download_window_destroy( struct gui_download_window * gdw)
 {
 
 
-	LOG((""));
+	LOG("");
 	if (gdw->status == NSATARI_DOWNLOAD_WORKING) {
 		download_context_abort(gdw->ctx);
 	}
@@ -255,7 +255,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *parent)
 	char alert[200];
 
 
-	LOG(("Creating download window for gui window: %p", parent));
+	LOG("Creating download window for gui window: %p", parent);
 
 	/* TODO: Implement real form and use messages file strings! */
 
@@ -332,9 +332,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *parent)
 	gemtk_wm_set_toolbar_redraw_func(gdw->guiwin, toolbar_redraw_cb);
 
 	strncpy((char*)&gdw->lbl_file, filename, MAX_SLEN_LBL_FILE-1);
-	LOG(("created download: %s (total size: %d)",
-		gdw->destination, gdw->size_total
-	));
+	LOG("created download: %s (total size: %d)", gdw->destination, gdw->size_total);
 
 	GRECT work, curr;
 	work.g_x = 0;
@@ -362,7 +360,7 @@ static nserror gui_download_window_data(struct gui_download_window *dw,
 	uint32_t tnow = clck / (CLOCKS_PER_SEC>>3);
 	uint32_t sdiff = (clck / (CLOCKS_PER_SEC)) - dw->start;
 
-	LOG((""));
+	LOG("");
 
 	if(dw->abort == true){
 		dw->status = NSATARI_DOWNLOAD_CANCELED;
@@ -410,7 +408,7 @@ static nserror gui_download_window_data(struct gui_download_window *dw,
 static void gui_download_window_error(struct gui_download_window *dw,
                                const char *error_msg)
 {
-	LOG(("%s", error_msg));
+	LOG("%s", error_msg);
 	strncpy((char*)&dw->lbl_file, error_msg, MAX_SLEN_LBL_FILE-1);
 	dw->status = NSATARI_DOWNLOAD_ERROR;
 	gemtk_wm_exec_redraw(dw->guiwin, NULL);
@@ -420,7 +418,7 @@ static void gui_download_window_error(struct gui_download_window *dw,
 
 static void gui_download_window_done(struct gui_download_window *dw)
 {
-	LOG((""));
+	LOG("");
 
 // TODO: change abort to close
 	dw->status = NSATARI_DOWNLOAD_COMPLETE;
diff --git a/atari/filetype.c b/atari/filetype.c
index 4e8c334f8..1cce6fc18 100644
--- a/atari/filetype.c
+++ b/atari/filetype.c
@@ -37,7 +37,7 @@ const char *fetch_filetype(const char *unix_path)
 	char * res = (char*)"text/html";
 	l = strlen(unix_path);
 
-	LOG(("unix path: %s", unix_path));
+	LOG("unix path: %s", unix_path);
 
 	/* This line is added for devlopment versions running from the root dir: */
 	if( strchr( unix_path, (int)'.' ) ){
@@ -86,6 +86,6 @@ const char *fetch_filetype(const char *unix_path)
 		}
 	}
 
-	LOG(("mime type: %s", res ));
+	LOG("mime type: %s", res);
 	return( res );
 }
diff --git a/atari/findfile.c b/atari/findfile.c
index 60b3ed510..89f858caf 100644
--- a/atari/findfile.c
+++ b/atari/findfile.c
@@ -37,7 +37,7 @@ char * local_file_to_url( const char * filename )
 	#define BACKSLASH	0x5C
 	char * url;
 
-	LOG(("in: %s", filename));
+	LOG("in: %s", filename);
 
 	if( strlen(filename) <= 2){
 		return( NULL );
@@ -61,7 +61,7 @@ char * local_file_to_url( const char * filename )
 
 	free(fname_local);
 
-	LOG(("out: %s", url));
+	LOG("out: %s", url);
 
 	return( url );
 	#undef BACKSLASH
@@ -87,10 +87,10 @@ char * atari_find_resource(char *buf, const char *filename, const char *def)
 {
 	char *cdir = NULL;
 	char t[PATH_MAX];
-	LOG(("%s (def: %s)", filename, def ));
+	LOG("%s (def: %s)", filename, def);
 	strcpy(t, NETSURF_GEM_RESPATH);
 	strcat(t, filename);
-	LOG(("checking %s", (char*)&t));
+	LOG("checking %s", (char *)&t);
 	if (gemdos_realpath(t, buf) != NULL) {
 		if (access(buf, R_OK) == 0) {
 			return buf;
@@ -98,7 +98,7 @@ char * atari_find_resource(char *buf, const char *filename, const char *def)
 	}
 	strcpy(t, "./");
 	strcat(t, filename);
-	LOG(("checking %s", (char*)&t));
+	LOG("checking %s", (char *)&t);
 	if (gemdos_realpath(t, buf) != NULL) {
 		if (access(buf, R_OK) == 0) {
 			return buf;
@@ -110,7 +110,7 @@ char * atari_find_resource(char *buf, const char *filename, const char *def)
 		strcpy(t, cdir);
 		strcat(t, "/.netsurf/");
 		strcat(t, filename);
-		LOG(("checking %s", (char*)&t));
+		LOG("checking %s", (char *)&t);
 		if (gemdos_realpath(t, buf) != NULL) {
 			if (access(buf, R_OK) == 0)
 				return buf;
@@ -122,19 +122,19 @@ char * atari_find_resource(char *buf, const char *filename, const char *def)
 		if (gemdos_realpath(cdir, buf) != NULL) {
 			strcat(buf, "/");
 			strcat(buf, filename);
-			LOG(("checking %s", (char*)&t));
+			LOG("checking %s", (char *)&t);
 			if (access(buf, R_OK) == 0)
 				return buf;
 		}
 	}
 	if (def[0] == '~') {
 		snprintf(t, PATH_MAX, "%s%s", getenv("HOME"), def + 1);
-		LOG(("checking %s", (char*)&t));
+		LOG("checking %s", (char *)&t);
 		if (gemdos_realpath(t, buf) == NULL) {
 			strcpy(buf, t);
 		}
 	} else {
-		LOG(("checking %s", (char*)def));
+		LOG("checking %s", (char *)def);
 		if (gemdos_realpath(def, buf) == NULL) {
 			strcpy(buf, def);
 		}
diff --git a/atari/gui.c b/atari/gui.c
index daf342ae2..23d31420d 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -150,11 +150,11 @@ static void atari_poll(void)
     evnt_multi_fast(&aes_event_in, aes_msg_out, &aes_event_out);
     if(gemtk_wm_dispatch_event(&aes_event_in, &aes_event_out, aes_msg_out) == 0) {
 	if( (aes_event_out.emo_events & MU_MESAG) != 0 ) {
-	    LOG(("WM: %d\n", aes_msg_out[0]));
+	    LOG("WM: %d\n", aes_msg_out[0]);
 	    switch(aes_msg_out[0]) {
 
 	    case MN_SELECTED:
-		LOG(("Menu Item: %d\n",aes_msg_out[4]));
+		LOG("Menu Item: %d\n", aes_msg_out[4]);
 		deskmenu_dispatch_item(aes_msg_out[3], aes_msg_out[4]);
 		break;
 
@@ -206,15 +206,13 @@ gui_window_create(struct browser_window *bw,
 		  gui_window_create_flags flags)
 {
     struct gui_window *gw=NULL;
-    LOG(( "gw: %p, BW: %p, existing %p, flags: %d\n" , gw,  bw, existing,
-	  (int)flags
-	    ));
+    LOG("gw: %p, BW: %p, existing %p, flags: %d\n", gw, bw, existing, (int)flags);
 
     gw = calloc(1, sizeof(struct gui_window));
     if (gw == NULL)
 	return NULL;
 
-    LOG(("new window: %p, bw: %p\n", gw, bw));
+    LOG("new window: %p, bw: %p\n", gw, bw);
     window_create(gw, bw, existing, WIDGET_STATUSBAR|WIDGET_TOOLBAR|WIDGET_RESIZE\
 		  |WIDGET_SCROLL);
     if (gw->root->win) {
@@ -266,7 +264,7 @@ void gui_window_destroy(struct gui_window *gw)
     if (gw == NULL)
 	return;
 
-    LOG(("%s\n", __FUNCTION__ ));
+    LOG("%s\n", __FUNCTION__);
 
     if (input_window == gw) {
 	gui_set_input_gui_window(NULL);
@@ -445,7 +443,7 @@ static void gui_window_set_scroll(struct gui_window *w, int sx, int sy)
 	   || (!browser_window_has_content(w->browser->bw)))
 	return;
 
-    LOG(("scroll (gui_window: %p) %d, %d\n", w, sx, sy));
+    LOG("scroll (gui_window: %p) %d, %d\n", w, sx, sy);
     window_scroll_by(w->root, sx, sy);
     return;
 
@@ -772,7 +770,7 @@ static void gui_401login_open(nsurl *url, const char *realm,
     char * out = NULL;
     bres = login_form_do( url, (char*)realm, &out);
     if (bres) {
-	LOG(("url: %s, realm: %s, auth: %s\n", url, realm, out ));
+	LOG("url: %s, realm: %s, auth: %s\n", url, realm, out);
 	urldb_set_auth_details(url, realm, out);
     }
     if (out != NULL) {
@@ -790,7 +788,7 @@ gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
 		void *cbpw)
 {
     struct sslcert_session_data *data;
-    LOG((""));
+    LOG("");
 
     // TODO: localize string
     int b = form_alert(1, "[2][SSL Verify failed, continue?][Continue|Abort|Details...]");
@@ -813,7 +811,7 @@ gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
 
 void gui_set_input_gui_window(struct gui_window *gw)
 {
-    LOG(("Setting input window from: %p to %p\n", input_window, gw));
+    LOG("Setting input window from: %p to %p\n", input_window, gw);
     input_window = gw;
 }
 
@@ -824,7 +822,7 @@ struct gui_window * gui_get_input_window(void)
 
 static void gui_quit(void)
 {
-    LOG((""));
+    LOG("");
 
     struct gui_window * gw = window_list;
     struct gui_window * tmp = window_list;
@@ -856,9 +854,9 @@ static void gui_quit(void)
 
     rsrc_free();
 
-    LOG(("Shutting down plotter"));
+    LOG("Shutting down plotter");
     plot_finalise();
-    LOG(("done"));
+    LOG("done");
 }
 
 /**
@@ -870,7 +868,7 @@ process_cmdline(int argc, char** argv)
     int opt;
     bool set_default_dimensions = true;
 
-    LOG(("argc %d, argv %p", argc, argv));
+    LOG("argc %d, argv %p", argc, argv);
 
     if ((nsoption_int(window_width) != 0) && (nsoption_int(window_height) != 0)) {
 
@@ -963,7 +961,7 @@ static nserror set_defaults(struct nsoption_s *defaults)
     /* Set defaults for absent option strings */
     nsoption_setnull_charp(cookie_file, strdup("cookies"));
     if (nsoption_charp(cookie_file) == NULL) {
-	LOG(("Failed initialising string options"));
+	LOG("Failed initialising string options");
 	return NSERROR_BAD_PARAMETER;
     }
     return NSERROR_OK;
@@ -980,7 +978,7 @@ static void gui_init(int argc, char** argv)
     OBJECT * cursors;
 
     atari_find_resource(buf, "netsurf.rsc", "./res/netsurf.rsc");
-    LOG(("Using RSC file: %s ", (char*)&buf));
+    LOG("Using RSC file: %s ", (char *)&buf);
     if (rsrc_load(buf)==0) {
 
 	char msg[1024];
@@ -1016,15 +1014,15 @@ static void gui_init(int argc, char** argv)
     create_cursor(MFORM_EX_FLAG_USERFORM, CURSOR_HELP,
 		  cursors, &gem_cursors.help);
 
-    LOG(("Enabling core select menu"));
+    LOG("Enabling core select menu");
     nsoption_set_bool(core_select_menu, true);
 
-    LOG(("Loading url.db from: %s", nsoption_charp(url_file) ));
+    LOG("Loading url.db from: %s", nsoption_charp(url_file));
     if( strlen(nsoption_charp(url_file)) ) {
 	urldb_load(nsoption_charp(url_file));
     }
 
-    LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
+    LOG("Loading cookies from: %s", nsoption_charp(cookie_file));
     if( strlen(nsoption_charp(cookie_file)) ) {
 	urldb_load_cookies(nsoption_charp(cookie_file));
     }
@@ -1032,10 +1030,10 @@ static void gui_init(int argc, char** argv)
     if (process_cmdline(argc,argv) != true)
 	die("unable to process command line.\n");
 
-    LOG(("Initializing NKC..."));
+    LOG("Initializing NKC...");
     nkc_init();
 
-    LOG(("Initializing plotters..."));
+    LOG("Initializing plotters...");
     plot_init(nsoption_charp(atari_font_driver));
 
     aes_event_in.emi_m1leave = MO_LEAVE;
@@ -1172,18 +1170,18 @@ int main(int argc, char** argv)
     nsoption_commandline(&argc, argv, NULL);
 
     /* common initialisation */
-    LOG(("Initialising core..."));
+    LOG("Initialising core...");
     ret = netsurf_init(messages, store);
     if (ret != NSERROR_OK) {
 	die("NetSurf failed to initialise");
     }
 
-    LOG(("Initializing GUI..."));
+    LOG("Initializing GUI...");
     gui_init(argc, argv);
 
     graf_mouse( ARROW , NULL);
 
-    LOG(("Creating initial browser window..."));
+    LOG("Creating initial browser window...");
     addr = option_homepage_url;
     if (strncmp(addr, "file://", 7) && strncmp(addr, "http://", 7)) {
 	if (stat(addr, &stat_buf) == 0) {
@@ -1205,7 +1203,7 @@ int main(int argc, char** argv)
     if (ret != NSERROR_OK) {
 	warn_user(messages_get_errorcode(ret), 0);
     } else {
-	LOG(("Entering Atari event mainloop..."));
+	LOG("Entering Atari event mainloop...");
 	while (!atari_quit) {
 	    atari_poll();
 	}
@@ -1219,7 +1217,7 @@ int main(int argc, char** argv)
     fclose(stdout);
     fclose(stderr);
 #endif
-    LOG(("exit_gem"));
+    LOG("exit_gem");
     exit_gem();
 
     return 0;
diff --git a/atari/history.c b/atari/history.c
index cb2ba9e17..f048b0bbe 100644
--- a/atari/history.c
+++ b/atari/history.c
@@ -72,13 +72,13 @@ static struct atari_treeview_callbacks atari_global_history_treeview_callbacks =
 static nserror atari_global_history_init_phase2(struct core_window *cw,
 						struct core_window_callback_table *cb_t)
 {
-	LOG((""));
+	LOG("");
 	return(global_history_init(cb_t, cw));
 }
 
 static void atari_global_history_finish(struct core_window *cw)
 {
-	LOG((""));
+	LOG("");
 	global_history_fini();
 }
 
@@ -91,7 +91,7 @@ static void atari_global_history_draw(struct core_window *cw, int x,
 
 static void atari_global_history_keypress(struct core_window *cw, uint32_t ucs4)
 {
-	LOG(("ucs4: %lu\n", ucs4));
+	LOG("ucs4: %lu\n", ucs4);
 	global_history_keypress(ucs4);
 }
 
@@ -99,7 +99,7 @@ static void atari_global_history_mouse_action(struct core_window *cw,
 					      browser_mouse_state mouse,
 					      int x, int y)
 {
-	LOG(("x:  %d, y: %d\n", x, y));
+	LOG("x:  %d, y: %d\n", x, y);
 
 	global_history_mouse_action(mouse, x, y);
 
@@ -111,7 +111,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 {
 	short retval = 0;
 
-	LOG((""));
+	LOG("");
 
 	if (ev_out->emo_events & MU_MESAG) {
 		switch (msg[0]) {
@@ -156,7 +156,7 @@ void atari_global_history_init(void)
 
 			if (atari_global_history.tv == NULL) {
 				/* handle it properly, clean up previous allocs */
-				LOG(("Failed to allocate treeview"));
+				LOG("Failed to allocate treeview");
 				return;
 			}
 		}
@@ -207,7 +207,7 @@ void atari_global_history_destroy(void)
 		atari_treeview_delete(atari_global_history.tv);
 		atari_global_history.init = false;
 	}
-	LOG(("done"));
+	LOG("done");
 }
 
 void atari_global_history_redraw(void)
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 621d68891..265491191 100644
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -72,13 +72,13 @@ static struct atari_treeview_callbacks atari_hotlist_treeview_callbacks = {
 static nserror atari_hotlist_init_phase2(struct core_window *cw,
 					 struct core_window_callback_table *cb_t)
 {
-	LOG((""));
+	LOG("");
 	return(hotlist_init(cb_t, cw, hl.path));
 }
 
 static void atari_hotlist_finish(struct core_window *cw)
 {
-	LOG((""));
+	LOG("");
 	hotlist_fini(hl.path);
 }
 
@@ -93,7 +93,7 @@ static void atari_hotlist_keypress(struct core_window *cw, uint32_t ucs4)
 {
 	GUIWIN *gemtk_win;
 	GRECT area;
-	LOG(("ucs4: %lu\n", ucs4));
+	LOG("ucs4: %lu\n", ucs4);
 	hotlist_keypress(ucs4);
 	gemtk_win = atari_treeview_get_gemtk_window(cw);
 	atari_treeview_get_grect(cw, TREEVIEW_AREA_CONTENT, &area);
@@ -104,7 +104,7 @@ static void atari_hotlist_mouse_action(struct core_window *cw,
 				       browser_mouse_state mouse,
 				       int x, int y)
 {
-	LOG(("x:  %d, y: %d\n", x, y));
+	LOG("x:  %d, y: %d\n", x, y);
 
 	hotlist_mouse_action(mouse, x, y);
 }
@@ -123,7 +123,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 	GRECT tb_area;
 	GUIWIN * gemtk_win;
 
-	LOG((""));
+	LOG("");
 
 	tv = (struct atari_treeview_window*) gemtk_wm_get_user_data(win);
 	cw = (struct core_window *)tv;
@@ -132,7 +132,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 		switch (msg[0]) {
 
 		case WM_TOOLBAR:
-			LOG(("WM_TOOLBAR"));
+			LOG("WM_TOOLBAR");
 
 			toolbar = gemtk_obj_get_tree(TOOLBAR_HOTLIST);
 
@@ -198,7 +198,7 @@ void atari_hotlist_init(void)
 			strncpy( (char*)&hl.path, nsoption_charp(hotlist_file), PATH_MAX-1 );
 		}
 
-		LOG(("Hotlist: %s",  (char*)&hl.path ));
+		LOG("Hotlist: %s", (char *)&hl.path);
 
 		if( hl.window == NULL ){
 			int flags = ATARI_TREEVIEW_WIDGETS;
@@ -223,7 +223,7 @@ void atari_hotlist_init(void)
 
 			if (hl.tv == NULL) {
 				/* handle it properly, clean up previous allocs */
-				LOG(("Failed to allocate treeview"));
+				LOG("Failed to allocate treeview");
 				return;
 			}
 
@@ -275,7 +275,7 @@ void atari_hotlist_destroy(void)
 		atari_treeview_delete(hl.tv);
 		hl.init = false;
 	}
-	LOG(("done"));
+	LOG("done");
 }
 
 void atari_hotlist_redraw(void)
@@ -298,7 +298,7 @@ void atari_hotlist_add_page( const char * url, const char * title )
 		return;
 
 	if (hotlist_has_url(nsurl)) {
-		LOG(("URL already added as Bookmark"));
+		LOG("URL already added as Bookmark");
 		nsurl_unref(nsurl);
 		return;
 	}
diff --git a/atari/osspec.c b/atari/osspec.c
index 2f21bbefe..adf8375cb 100644
--- a/atari/osspec.c
+++ b/atari/osspec.c
@@ -117,14 +117,14 @@ char *gemdos_realpath(const char * path, char * rpath)
 		return(rpath);
 	}
 
-	LOG(("realpath in: %s\n", path));
+	LOG("realpath in: %s\n", path);
 	r = realpath(path, work);
 	if (r != NULL) {
 		unx2dos((const char *)r, rpath);
-		LOG(("realpath out: %s\n", rpath));
+		LOG("realpath out: %s\n", rpath);
 		return(rpath);
 	} else {
-		LOG(("realpath out: NULL!\n"));
+		LOG("realpath out: NULL!\n");
 	}
 	return (NULL);
 }
diff --git a/atari/plot/font_freetype.c b/atari/plot/font_freetype.c
index 086008dd7..a77aff855 100644
--- a/atari/plot/font_freetype.c
+++ b/atari/plot/font_freetype.c
@@ -154,11 +154,11 @@ static FT_Error ft_face_requester(FTC_FaceID face_id, FT_Library  library, FT_Po
 
 	error = FT_New_Face(library, ft_face->fontfile, ft_face->index, face);
 	if (error) {
-		LOG(("Could not find font (code %d)\n", error));
+		LOG("Could not find font (code %d)\n", error);
 	} else {
 		error = FT_Select_Charmap(*face, FT_ENCODING_UNICODE);
 		if (error) {
-			LOG(("Could not select charmap (code %d)\n", error));
+			LOG("Could not select charmap (code %d)\n", error);
 		} else {
 			for (cidx = 0; cidx < (*face)->num_charmaps; cidx++) {
 				if ((*face)->charmap == (*face)->charmaps[cidx]) {
@@ -168,7 +168,7 @@ static FT_Error ft_face_requester(FTC_FaceID face_id, FT_Library  library, FT_Po
 			}
 		}
 	}
-	LOG(("Loaded face from %s\n", ft_face->fontfile));
+	LOG("Loaded face from %s\n", ft_face->fontfile);
 	return error;
 }
 
@@ -190,7 +190,7 @@ ft_new_face(const char *option, const char *resname, const char *fontfile)
 	}
 	error = FTC_Manager_LookupFace(ft_cmanager, (FTC_FaceID)newf, &aface);
 	if (error) {
-		LOG(("Could not find font face %s (code %d)\n", fontfile, error));
+		LOG("Could not find font face %s (code %d)\n", fontfile, error);
 		free(newf);
 		newf = font_faces[FONT_FACE_DEFAULT]; /* use default */
 	}
@@ -291,7 +291,7 @@ static bool ft_font_init(void)
 	/* freetype library initialise */
 	error = FT_Init_FreeType( &library );
 	if (error) {
-		LOG(("Freetype could not initialised (code %d)\n", error));
+		LOG("Freetype could not initialised (code %d)\n", error);
 		return false;
 	}
 
@@ -310,7 +310,7 @@ static bool ft_font_init(void)
 				NULL,
 				&ft_cmanager);
 	if (error) {
-		LOG(("Freetype could not initialise cache manager (code %d)\n", error));
+		LOG("Freetype could not initialise cache manager (code %d)\n", error);
 		FT_Done_FreeType(library);
 		return false;
 	}
@@ -329,7 +329,7 @@ static bool ft_font_init(void)
 							FONT_PKG_PATH FONT_FILE_SANS
 										);
 	if (font_faces[FONT_FACE_SANS_SERIF] == NULL) {
-		LOG(("Could not find default font (code %d)\n", error));
+		LOG("Could not find default font (code %d)\n", error);
 		FTC_Manager_Done(ft_cmanager);
 		FT_Done_FreeType(library);
 		return false;
@@ -687,7 +687,7 @@ int ctor_font_plotter_freetype( FONT_PLOTTER self )
 		self->draw_glyph = draw_glyph8;
 	}
 
-	LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__));
+	LOG("%s: %s\n", (char *)__FILE__, __FUNCTION__);
 	if( !init ) {
 		ft_font_init();
 		fontbmp = atari_bitmap_create(48, 48, 0);
diff --git a/atari/plot/font_internal.c b/atari/plot/font_internal.c
index 66413f49c..1578b39d6 100644
--- a/atari/plot/font_internal.c
+++ b/atari/plot/font_internal.c
@@ -95,7 +95,7 @@ int ctor_font_plotter_internal( FONT_PLOTTER self )
 	self->str_split = str_split;
 	self->pixel_pos = pixel_pos;
 	self->text = text;
-	LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__));
+	LOG("%s: %s\n", (char *)__FILE__, __FUNCTION__);
 	if( !init ) {
 		vdih = self->vdi_handle;
 		fontbmp = atari_bitmap_create(48, 48, 0);
diff --git a/atari/plot/font_vdi.c b/atari/plot/font_vdi.c
index 7c186107a..ef5499207 100644
--- a/atari/plot/font_vdi.c
+++ b/atari/plot/font_vdi.c
@@ -70,7 +70,7 @@ int ctor_font_plotter_vdi( FONT_PLOTTER self )
 	self->str_split = str_split;
 	self->pixel_pos = pixel_pos;
 	self->text = text;
-	LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__));
+	LOG("%s: %s\n", (char *)__FILE__, __FUNCTION__);
 	if( !init ) {
 		vdih = self->vdi_handle;
 	}
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index ac998a4d5..1ac3ee973 100644
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -1542,7 +1542,7 @@ int plot_init(char * fdrvrname)
         short work_out[57];
         atari_plot_vdi_handle=graf_handle(&dummy, &dummy, &dummy, &dummy);
         v_opnvwk(work_in, &atari_plot_vdi_handle, work_out);
-        LOG(("Plot VDI handle: %d", atari_plot_vdi_handle));
+        LOG("Plot VDI handle: %d", atari_plot_vdi_handle);
     }
 	read_vdi_sysinfo(atari_plot_vdi_handle, &vdi_sysinfo);
     if(verbose_log) {
diff --git a/atari/rootwin.c b/atari/rootwin.c
index 7b4cd0361..c9f507167 100644
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -106,7 +106,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
         switch (msg[0]) {
 
         case WM_REDRAW:
-			LOG(("WM_REDRAW"));
+			LOG("WM_REDRAW");
             on_redraw(data->rootwin, msg);
             break;
 
@@ -114,7 +114,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
         case WM_SIZED:
         case WM_MOVED:
         case WM_FULLED:
-			LOG(("WM_SIZED"));
+			LOG("WM_SIZED");
             on_resized(data->rootwin);
             break;
 
@@ -133,7 +133,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
         case WM_TOPPED:
         case WM_NEWTOP:
         case WM_UNICONIFY:
-			LOG(("WM_TOPPED"));
+			LOG("WM_TOPPED");
             gui_set_input_gui_window(data->rootwin->active_gui_window);
             //window_restore_active_gui_window(data->rootwin);
             // TODO: use something like "restore_active_gui_window_state()"
@@ -144,8 +144,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
             // TODO: this needs to iterate through all gui windows and
             // check if the rootwin is this window...
             if (data->rootwin->active_gui_window != NULL) {
-                LOG(("WM_CLOSED initiated destroy for bw %p",
-                     data->rootwin->active_gui_window->browser->bw));
+                LOG("WM_CLOSED initiated destroy for bw %p", data->rootwin->active_gui_window->browser->bw);
                 browser_window_destroy(
                     data->rootwin->active_gui_window->browser->bw);
             }
@@ -168,14 +167,13 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
         // handle key
         uint16_t nkc = gem_to_norm( (short)ev_out->emo_kmeta,
                                     (short)ev_out->emo_kreturn);
-		LOG(("rootwin MU_KEYBD input, nkc: %x\n", nkc));
+		LOG("rootwin MU_KEYBD input, nkc: %x\n", nkc);
         retval = on_window_key_input(data->rootwin, nkc);
         // printf("on_window_key_input: %d\n", retval);
 
     }
     if ((ev_out->emo_events & MU_BUTTON) != 0) {
-		LOG(("rootwin MU_BUTTON input, x: %d, y: %d\n", ev_out->emo_mouse.p_x,
-			ev_out->emo_mouse.p_x));
+		LOG("rootwin MU_BUTTON input, x: %d, y: %d\n", ev_out->emo_mouse.p_x, ev_out->emo_mouse.p_x);
         window_get_grect(data->rootwin, BROWSER_AREA_CONTENT,
                          &area);
         if (POINT_WITHIN(ev_out->emo_mouse.p_x, ev_out->emo_mouse.p_y,
@@ -315,13 +313,13 @@ void window_unref_gui_window(ROOTWIN *rootwin, struct gui_window *gw)
     struct gui_window *w;
     input_window = NULL;
 
-    LOG(("window: %p, gui_window: %p", rootwin, gw));
+    LOG("window: %p, gui_window: %p", rootwin, gw);
 
     w = window_list;
     // find the next active tab:
     while( w != NULL ) {
         if(w->root == rootwin && w != gw) {
-        	LOG(("activating next tab %p", w));
+        	LOG("activating next tab %p", w);
             gui_set_input_gui_window(w);
             break;
         }
@@ -341,7 +339,7 @@ int window_destroy(ROOTWIN *rootwin)
 
     assert(rootwin != NULL);
 
-    LOG(("%p", rootwin));
+    LOG("%p", rootwin);
 
     if (gemtk_wm_get_user_data(rootwin->win) != NULL) {
         free(gemtk_wm_get_user_data(rootwin->win));
@@ -407,7 +405,7 @@ void window_restore_active_gui_window(ROOTWIN *rootwin)
 	GRECT tb_area;
 	struct gui_window *gw;
 
-	LOG((""));
+	LOG("");
 
 	assert(rootwin->active_gui_window);
 
@@ -502,7 +500,7 @@ void window_set_focus(struct s_gui_win_root *rootwin,
     assert(rootwin != NULL);
 
     if (rootwin->focus.type != type || rootwin->focus.element != element) {
-        LOG(("Set focus: %p (%d)\n", element, type));
+        LOG("Set focus: %p (%d)\n", element, type);
         rootwin->focus.type = type;
         rootwin->focus.element = element;
 		switch( type ) {
@@ -566,11 +564,11 @@ void window_set_active_gui_window(ROOTWIN *rootwin, struct gui_window *gw)
 {
 	struct gui_window *old_gw = rootwin->active_gui_window;
 
-	LOG((""));
+	LOG("");
 
     if (rootwin->active_gui_window != NULL) {
         if(rootwin->active_gui_window == gw) {
-        	LOG(("nothing to do..."));
+        	LOG("nothing to do...");
             return;
         }
     }
@@ -579,7 +577,7 @@ void window_set_active_gui_window(ROOTWIN *rootwin, struct gui_window *gw)
 
 	rootwin->active_gui_window = gw;
 	if (old_gw != NULL) {
-		LOG(("restoring window..."));
+		LOG("restoring window...");
 		window_restore_active_gui_window(rootwin);
 	}
 }
@@ -654,7 +652,7 @@ void window_open_search(ROOTWIN *rootwin, bool reformat)
 	GRECT area;
 	OBJECT *obj;
 
-	LOG((""));
+	LOG("");
 
 	gw = rootwin->active_gui_window;
 	bw = gw->browser->bw;
@@ -1471,10 +1469,7 @@ static void on_file_dropped(ROOTWIN *rootwin, short msg[8])
 
                 buff[size] = 0;
 
-                LOG(("file: %s, ext: %s, size: %d dropped at: %d,%d\n",
-                 (char*)buff, (char*)&ext,
-                 size, mx, my
-                ));
+                LOG("file: %s, ext: %s, size: %d dropped at: %d,%d\n", (char *)buff, (char *)&ext, size, mx, my);
 
                 gui_window_get_scroll(gw, &sx, &sy);
 
@@ -1496,7 +1491,7 @@ static void on_file_dropped(ROOTWIN *rootwin, short msg[8])
                     if (ret != NSERROR_OK) {
                         free(buff);
                         /* A bad encoding should never happen */
-                        LOG(("utf8_from_local_encoding failed"));
+                        LOG("utf8_from_local_encoding failed");
                         assert(ret != NSERROR_BAD_ENCODING);
                         /* no memory */
                         goto error;
diff --git a/atari/schedule.c b/atari/schedule.c
index 4ff51d4f9..bb47cc623 100644
--- a/atari/schedule.c
+++ b/atari/schedule.c
@@ -71,7 +71,7 @@ static nserror schedule_remove(void (*callback)(void *p), void *p)
                 return NSERROR_OK;
 	}
 
-	LOG(("removing %p, %p", callback, p));
+	LOG("removing %p, %p", callback, p);
 
 	cur_nscb = schedule_list;
 	prev_nscb = NULL;
@@ -80,8 +80,7 @@ static nserror schedule_remove(void (*callback)(void *p), void *p)
 		if ((cur_nscb->callback ==  callback) &&
                     (cur_nscb->p ==  p)) {
 			/* item to remove */
-			LOG(("callback entry %p removing  %p(%p)",
-			       cur_nscb, cur_nscb->callback, cur_nscb->p));
+			LOG("callback entry %p removing  %p(%p)", cur_nscb, cur_nscb->callback, cur_nscb->p);
 
 			/* remove callback */
 			unlnk_nscb = cur_nscb;
@@ -119,8 +118,7 @@ nserror atari_schedule(int ival, void (*callback)(void *p), void *p)
 
 	nscb->timeout = MS_NOW() + ival;
 
-	LOG(("adding callback %p for  %p(%p) at %d ms",
-	       nscb, callback, p, nscb->timeout ));
+	LOG("adding callback %p for  %p(%p) at %d ms", nscb, callback, p, nscb->timeout);
 
 	nscb->callback = callback;
 	nscb->p = p;
@@ -166,8 +164,7 @@ int schedule_run(void)
 				prev_nscb->next = unlnk_nscb->next;
 			}
 
-			LOG(("callback entry %p running %p(%p)",
-			       unlnk_nscb, unlnk_nscb->callback, unlnk_nscb->p));
+			LOG("callback entry %p running %p(%p)", unlnk_nscb, unlnk_nscb->callback, unlnk_nscb->p);
 
 			/* call callback */
 			unlnk_nscb->callback(unlnk_nscb->p);
@@ -176,7 +173,7 @@ int schedule_run(void)
 
 			/* need to deal with callback modifying the list. */
 			if (schedule_list == NULL) 	{
-				LOG(("schedule_list == NULL"));
+				LOG("schedule_list == NULL");
 
 				return -1; /* no more callbacks scheduled */
 			}
@@ -201,7 +198,7 @@ int schedule_run(void)
 	/* make rettime relative to now and convert to ms */
 	nexttime = nexttime - now;
 
-	LOG(("returning time to next event as %ldms", nexttime ));
+	LOG("returning time to next event as %ldms", nexttime);
 
 	/*return next event time in milliseconds (24days max wait) */
 	return nexttime;
@@ -213,14 +210,14 @@ void list_schedule(void)
 {
 	struct nscallback *cur_nscb;
 
-	LOG(("schedule list at ms clock %ld", MS_NOW() ));
+	LOG("schedule list at ms clock %ld", MS_NOW());
 
 	cur_nscb = schedule_list;
 	while (cur_nscb != NULL) {
-		LOG(("Schedule %p at %ld", cur_nscb, cur_nscb->timeout ));
+		LOG("Schedule %p at %ld", cur_nscb, cur_nscb->timeout);
 		cur_nscb = cur_nscb->next;
 	}
-	LOG(("Maxmium callbacks scheduled: %d", max_scheduled ));
+	LOG("Maxmium callbacks scheduled: %d", max_scheduled);
 }
 
 
diff --git a/atari/search.c b/atari/search.c
index c2b02f06a..8ba552198 100644
--- a/atari/search.c
+++ b/atari/search.c
@@ -67,7 +67,7 @@ struct gui_search_table *atari_search_table = &search_table;
  */
 void nsatari_search_set_status(bool found, void *p)
 {
-	LOG(("%p set status: %d\n", p, found));
+	LOG("%p set status: %d\n", p, found);
 	// TODO: maybe update GUI
 }
 
@@ -80,7 +80,7 @@ void nsatari_search_set_status(bool found, void *p)
 void nsatari_search_set_hourglass(bool active, void *p)
 {
 	SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;
-	LOG(("active: %d, session: %p", active, p));
+	LOG("active: %d, session: %p", active, p);
 	if (active) {
 		gui_window_set_pointer(s->g, GUI_POINTER_PROGRESS);
 	} else {
@@ -99,7 +99,7 @@ void nsatari_search_set_hourglass(bool active, void *p)
  */
 void nsatari_search_add_recent(const char *string, void *p)
 {
-	LOG(("%p add recent: %s\n", p, string));
+	LOG("%p add recent: %s\n", p, string);
 }
 
 
@@ -115,7 +115,7 @@ void nsatari_search_set_forward_state(bool active, void *p)
 	GRECT area;
 	SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;
 	/* deactivate back cb */
-	LOG(("%p: set forward state: %d\n", p, active));
+	LOG("%p: set forward state: %d\n", p, active);
 
 	gw = s->g;
 
@@ -142,7 +142,7 @@ void nsatari_search_set_back_state(bool active, void *p)
 	GRECT area;
 	SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;
 	/* deactivate back cb */
-	LOG(("%p: set back state: %d\n", p, active));
+	LOG("%p: set back state: %d\n", p, active);
 
 	s->state.back_avail = active;
 	gw = s->g;
@@ -224,7 +224,7 @@ void nsatari_search_restore_form( struct s_search_form_session *s, OBJECT *obj)
 void nsatari_search_session_destroy(struct s_search_form_session *s)
 {
 	if (s != NULL) {
-		LOG((""));
+		LOG("");
 		browser_window_search_clear(s->g->browser->bw);
 		free(s);
 	}
diff --git a/atari/settings.c b/atari/settings.c
index 6a9faf190..e921da247 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -169,7 +169,7 @@ static char **read_locales(void)
         warn_user("Failed to load locales: %s",buf);
         return(NULL);
     } else {
-        LOG(("Reading locales from: %s...", buf));
+        LOG("Reading locales from: %s...", buf);
     }
 
     /* Count items: */
@@ -977,12 +977,12 @@ void open_settings(void)
 
 void close_settings(void)
 {
-    LOG((""));
+    LOG("");
     gemtk_wm_remove(settings_guiwin);
     settings_guiwin = NULL;
     wind_close(h_aes_win);
     wind_delete(h_aes_win);
     h_aes_win = 0;
-    LOG(("Done"));
+    LOG("Done");
 }
 
diff --git a/atari/statusbar.c b/atari/statusbar.c
index b10a95a0e..c9d0f78aa 100644
--- a/atari/statusbar.c
+++ b/atari/statusbar.c
@@ -166,7 +166,7 @@ CMP_STATUSBAR sb_create( struct gui_window * gw )
 
 void sb_destroy( CMP_STATUSBAR s )
 {
-	LOG(("%s\n", __FUNCTION__ ));
+	LOG("%s\n", __FUNCTION__);
 	if( s ) {
 		if( s->comp ){
 			mt_CompDelete( &app, s->comp );
@@ -206,7 +206,7 @@ CMP_STATUSBAR sb_create( struct gui_window * gw )
 
 void sb_destroy( CMP_STATUSBAR s )
 {
-	LOG(("%s\n", __FUNCTION__ ));
+	LOG("%s\n", __FUNCTION__);
 	if( s ) {
 		free( s );
 	}
diff --git a/atari/toolbar.c b/atari/toolbar.c
index c2e7ced06..e830679d9 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -272,7 +272,7 @@ struct s_toolbar *toolbar_create(struct s_gui_win_root *owner)
 	int i;
 	struct s_toolbar *t;
 
-	LOG((""));
+	LOG("");
 
 	assert(init == true);
 
@@ -330,8 +330,7 @@ struct s_toolbar *toolbar_create(struct s_gui_win_root *owner)
 	t->throbber.max_index = THROBBER_MAX_INDEX;
 	t->throbber.running = false;
 
-	LOG(("created toolbar: %p, root: %p, textarea: %p, throbber: %p", t,
-	     owner, t->url.textarea, t->throbber));
+	LOG("created toolbar: %p, root: %p, textarea: %p, throbber: %p", t, owner, t->url.textarea, t->throbber);
 	return( t );
 }
 
@@ -459,7 +458,7 @@ void toolbar_redraw(struct s_toolbar *tb, GRECT *clip)
 void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
 			    short button)
 {
-	LOG((""));
+	LOG("");
 
 	struct s_tb_button * bt;
 	bool enable = false;
@@ -583,7 +582,7 @@ void toolbar_set_dimensions(struct s_toolbar *tb, GRECT *area)
 
 void toolbar_set_url(struct s_toolbar *tb, const char * text)
 {
-	LOG((""));
+	LOG("");
 	textarea_set_text(tb->url.textarea, text);
 
 	if (tb->attached && tb->visible) {
@@ -668,7 +667,7 @@ bool toolbar_text_input(struct s_toolbar *tb, char *text)
 {
 	bool handled = true;
 
-	LOG((""));
+	LOG("");
 
 	return(handled);
 }
@@ -753,7 +752,7 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
 
 void toolbar_mouse_input(struct s_toolbar *tb, short obj, short button)
 {
-	LOG((""));
+	LOG("");
 	GRECT work;
 	short mx, my, mb, kstat;
 	struct gui_window * gw;
diff --git a/atari/treeview.c b/atari/treeview.c
index 2f99cbc8a..20ac3e7fe 100644
--- a/atari/treeview.c
+++ b/atari/treeview.c
@@ -326,8 +326,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
         on_keybd_event(cw, ev_out, msg);
     }
     if( (ev_out->emo_events & MU_BUTTON) != 0 ) {
-        LOG(("Treeview click at: %d,%d\n", ev_out->emo_mouse.p_x,
-             ev_out->emo_mouse.p_y));
+        LOG("Treeview click at: %d,%d\n", ev_out->emo_mouse.p_x, ev_out->emo_mouse.p_y);
         on_mbutton_event(cw, ev_out, msg);
     }
 
@@ -528,7 +527,7 @@ atari_treeview_create(GUIWIN *win, struct atari_treeview_callbacks * callbacks,
 
 	tv = calloc(1, sizeof(struct atari_treeview_window));
 	if (tv == NULL) {
-		LOG(("calloc failed"));
+		LOG("calloc failed");
 		warn_user(messages_get_errorcode(NSERROR_NOMEM), 0);
 		return NULL;
 	}
diff --git a/atari/verify_ssl.c b/atari/verify_ssl.c
index 5d3f86856..8b7525a4c 100644
--- a/atari/verify_ssl.c
+++ b/atari/verify_ssl.c
@@ -159,7 +159,7 @@ static void do_popup( WINDOW *win, int index, int mode, void *data)
 	char * items[dp->num_certs];
 	short x, y;
 	unsigned int i;
-	LOG(("do_popup: num certs: %d", dp->num_certs));
+	LOG("do_popup: num certs: %d", dp->num_certs);
 	for( i = 0; i<dp->num_certs; i++) {
 		items[i] = malloc( 48 );
 		strncpy(items[i], (char*)&dp->cert_infos_n[i].issuer, 46 );
@@ -244,7 +244,7 @@ bool verify_ssl_form_do( const char * url, const struct ssl_cert_info * cert_inf
 				break;
 
 			case VERIFY_BT_SCROLL_R:
-					LOG(( "scroll r!" ));
+					LOG("scroll r!");
 					cont = true;
 					dp.scrollx += 1;
 					if( dp.scrollx > (dp.cols - (272 / 8 )) )