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.

12 files changed, 82 insertions, 98 deletions

diff --git a/windows/about.c b/windows/about.c
index 904a6ef8c..686d350f0 100644
--- a/windows/about.c
+++ b/windows/about.c
@@ -52,7 +52,7 @@ static BOOL init_about_dialog(HWND hwnd)
 
 		hFont=CreateFont (26, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, "Arial");
 		if (hFont != NULL) {
-			LOG(("Setting font object"));
+			LOG("Setting font object");
 			SendMessage(dlg_itm, WM_SETFONT, (WPARAM)hFont, 0);
 		}
 
@@ -85,7 +85,7 @@ static BOOL destroy_about_dialog(HWND hwnd)
 	if (dlg_itm != NULL) {
 		hFont = (HFONT)SendMessage(dlg_itm, WM_GETFONT, 0, 0);
 		if (hFont != NULL) {
-			LOG(("Destroyed font object"));
+			LOG("Destroyed font object");
 			DeleteObject(hFont); 	
 		}
 	}
@@ -107,12 +107,12 @@ nsws_about_event_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 	case WM_COMMAND:
 		switch(LOWORD(wparam)) {
 		case IDOK:
-			LOG(("OK clicked"));
+			LOG("OK clicked");
 			EndDialog(hwnd, IDOK);
 			break;
 
 		case IDCANCEL:
-			LOG(("Cancel clicked"));
+			LOG("Cancel clicked");
 			EndDialog(hwnd, IDOK);
 			break;
 
diff --git a/windows/bitmap.c b/windows/bitmap.c
index f7505b0c4..68dd955dd 100644
--- a/windows/bitmap.c
+++ b/windows/bitmap.c
@@ -51,7 +51,7 @@ void *win32_bitmap_create(int width, int height, unsigned int state)
 	HBITMAP windib;
 	uint8_t *pixdata;
 
-	LOG(("width %d, height %d, state %u",width,height,state));
+	LOG("width %d, height %d, state %u", width, height, state);
 
 	pbmi = calloc(1, sizeof(BITMAPV5HEADER));
 	if (pbmi == NULL) {
@@ -95,7 +95,7 @@ void *win32_bitmap_create(int width, int height, unsigned int state)
 		bitmap->opaque = false;
 	}
 
-	LOG(("bitmap %p", bitmap));
+	LOG("bitmap %p", bitmap);
 
 	return bitmap;
 }
@@ -114,7 +114,7 @@ static unsigned char *bitmap_get_buffer(void *bitmap)
 {
 	struct bitmap *bm = bitmap;
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return NULL;
 	}
 
@@ -133,7 +133,7 @@ static size_t bitmap_get_rowstride(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return 0;
 	}
 
@@ -151,7 +151,7 @@ void win32_bitmap_destroy(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return;
 	}
 
@@ -194,11 +194,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;
 }
 
@@ -215,7 +215,7 @@ static bool bitmap_test_opaque(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return false;
 	}
 
@@ -223,11 +223,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;
 }
 
@@ -242,7 +242,7 @@ static bool bitmap_get_opaque(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return false;
 	}
 
@@ -254,7 +254,7 @@ static int bitmap_get_width(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return 0;
 	}
 
@@ -266,7 +266,7 @@ static int bitmap_get_height(void *bitmap)
 	struct bitmap *bm = bitmap;
 
 	if (bitmap == NULL) {
-		LOG(("NULL bitmap!"));
+		LOG("NULL bitmap!");
 		return 0;
 	}
 
@@ -368,8 +368,7 @@ static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *conte
 	height = ((width * bitmap->height) + (bitmap->width / 2)) /
 		bitmap->width;
 
-	LOG(("bitmap %p for content %p width %d, height %d",
-	     bitmap, content, width, height));
+	LOG("bitmap %p for content %p width %d, height %d", bitmap, content, width, height);
 
 	/* create two memory device contexts to put the bitmaps in */
 	bufferdc = CreateCompatibleDC(NULL);
diff --git a/windows/download.c b/windows/download.c
index 995ca1386..e1641bae3 100644
--- a/windows/download.c
+++ b/windows/download.c
@@ -137,8 +137,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *gui)
 		strcat(destination, "/");
 	if (strlen(destination) + strlen(filename) < PATH_MAX - 1)
 		strcat(destination, filename);
-	LOG(("download %s [%s] from %s to %s", filename, size, domain,
-			destination));
+	LOG("download %s [%s] from %s to %s", filename, size, domain, destination);
 	w->title = filename;
 	w->domain = domain;
 	w->size = total_size;
@@ -308,7 +307,7 @@ gui_download_window_data(struct gui_download_window *w, const char *data,
 	struct timeval val;
 	res = fwrite((void *)data, 1, size, w->file);
 	if (res != size)
-		LOG(("file write error %d of %d", size - res, size));
+		LOG("file write error %d of %d", size - res, size);
 	w->downloaded += res;
 	w->progress = (unsigned int)(((long long)(w->downloaded) * 10000)
 			/ w->size);
@@ -322,7 +321,7 @@ gui_download_window_data(struct gui_download_window *w, const char *data,
 static void gui_download_window_error(struct gui_download_window *w,
 		const char *error_msg)
 {
-	LOG(("error %s", error_msg));
+	LOG("error %s", error_msg);
 }
 
 static void gui_download_window_done(struct gui_download_window *w)
diff --git a/windows/drawable.c b/windows/drawable.c
index f53e5d4d2..317143a46 100644
--- a/windows/drawable.c
+++ b/windows/drawable.c
@@ -76,7 +76,7 @@ nsws_drawable_vscroll(struct gui_window *gw, HWND hwnd, WPARAM wparam)
 	SCROLLINFO si;
 	int mem;
 
-	LOG(("VSCROLL %d", gw->requestscrolly));
+	LOG("VSCROLL %d", gw->requestscrolly);
 
 	if (gw->requestscrolly != 0)
 		return 0;
@@ -148,7 +148,7 @@ nsws_drawable_hscroll(struct gui_window *gw, HWND hwnd, WPARAM wparam)
 	SCROLLINFO si;
 	int mem;
 
-	LOG(("HSCROLL %d", gw->requestscrollx));
+	LOG("HSCROLL %d", gw->requestscrollx);
 
 	if (gw->requestscrollx != 0)
 		return 0;
@@ -357,7 +357,7 @@ nsws_drawable_mouseup(struct gui_window *gw,
 	    (gw->bw == NULL))
 		return 0;
 
-	LOG(("state 0x%x, press 0x%x", gw->mouse->state, press));
+	LOG("state 0x%x, press 0x%x", gw->mouse->state, press);
 	if ((gw->mouse->state & press) != 0) {
 		gw->mouse->state &= ~press;
 		gw->mouse->state |= click;
@@ -371,10 +371,7 @@ nsws_drawable_mouseup(struct gui_window *gw,
 		gw->mouse->state &= ~BROWSER_MOUSE_MOD_3;
 
 	if ((gw->mouse->state & click) != 0) {
-		LOG(("mouse click bw %p, state 0x%x, x %f, y %f",gw->bw,
-		     gw->mouse->state,
-		     (x + gw->scrollx) / gw->scale,
-		     (y + gw->scrolly) / gw->scale));
+		LOG("mouse click bw %p, state 0x%x, x %f, y %f", gw->bw, gw->mouse->state, (x + gw->scrollx) / gw->scale, (y + gw->scrolly) / gw->scale);
 
 		browser_window_mouse_click(gw->bw,
 					   gw->mouse->state,
@@ -418,10 +415,7 @@ nsws_drawable_mousedown(struct gui_window *gw,
 	gw->mouse->pressed_x = (x + gw->scrollx) / gw->scale;
 	gw->mouse->pressed_y = (y + gw->scrolly) / gw->scale;
 
-	LOG(("mouse click bw %p, state %x, x %f, y %f", gw->bw,
-	     gw->mouse->state,
-	     (x + gw->scrollx) / gw->scale,
-	     (y + gw->scrolly) / gw->scale));
+	LOG("mouse click bw %p, state %x, x %f, y %f", gw->bw, gw->mouse->state, (x + gw->scrollx) / gw->scale, (y + gw->scrolly) / gw->scale);
 
 	browser_window_mouse_click(gw->bw, gw->mouse->state,
 				   (x + gw->scrollx) / gw->scale,
@@ -453,7 +447,7 @@ nsws_drawable_mousemove(struct gui_window *gw, int x, int y)
 	    (abs(x - gw->mouse->pressed_x) >= 5) &&
 	    (abs(y - gw->mouse->pressed_y) >= 5)) {
 
-		LOG(("Drag start state 0x%x", gw->mouse->state));
+		LOG("Drag start state 0x%x", gw->mouse->state);
 
 		if ((gw->mouse->state & BROWSER_MOUSE_PRESS_1) != 0) {
 			browser_window_mouse_click(gw->bw, BROWSER_MOUSE_DRAG_1,
@@ -501,7 +495,7 @@ nsws_window_drawable_event_callback(HWND hwnd,
 
 	gw = nsws_get_gui_window(hwnd);
 	if (gw == NULL) {
-		LOG(("Unable to find gui window structure for hwnd %p", hwnd));
+		LOG("Unable to find gui window structure for hwnd %p", hwnd);
 		return DefWindowProc(hwnd, msg, wparam, lparam);
 	}
 
@@ -590,7 +584,7 @@ nsws_window_create_drawable(HINSTANCE hinstance,
 
 	if (hwnd == NULL) {
 		win_perror("WindowCreateDrawable");
-		LOG(("Window creation failed"));
+		LOG("Window creation failed");
 		return NULL;
 	}
 
diff --git a/windows/filetype.c b/windows/filetype.c
index 281a3d7a3..b06534d6a 100644
--- a/windows/filetype.c
+++ b/windows/filetype.c
@@ -32,7 +32,7 @@
 static const char *fetch_filetype(const char *unix_path)
 {
 	int l;
-	LOG(("unix path %s", unix_path));
+	LOG("unix path %s", unix_path);
 	l = strlen(unix_path);
 	if (2 < l && strcasecmp(unix_path + l - 3, "css") == 0)
 		return "text/css";
diff --git a/windows/findfile.c b/windows/findfile.c
index 7323666d3..8c8906a80 100644
--- a/windows/findfile.c
+++ b/windows/findfile.c
@@ -102,7 +102,7 @@ char *nsws_find_resource(char *buf, const char *filename, const char *def)
 	char t[PATH_MAX];
 
 	if (cdir != NULL) {
-		LOG(("Found Home %s", cdir));
+		LOG("Found Home %s", cdir);
 		strcpy(t, cdir);
 		strcat(t, "/.netsurf/");
 		strcat(t, filename);
@@ -129,7 +129,7 @@ char *nsws_find_resource(char *buf, const char *filename, const char *def)
 	getcwd(t, PATH_MAX - SLEN("\\res\\") - strlen(filename));
 	strcat(t, "\\res\\");
 	strcat(t, filename);
-	LOG(("looking in %s", t));
+	LOG("looking in %s", t);
 	if ((realpath(t, buf) != NULL) && (access(buf, R_OK) == 0))
 		return buf;
 
diff --git a/windows/gui.c b/windows/gui.c
index 0df219002..431e5c9bb 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -56,7 +56,7 @@ void win32_run(void)
 	int timeout; /* timeout in miliseconds */
 	UINT timer_id = 0;
 
-	LOG(("Starting messgae dispatcher"));
+	LOG("Starting messgae dispatcher");
 
 	while (!win32_quit) {
 		/* run the scheduler and discover how long to wait for
@@ -109,7 +109,7 @@ static void gui_get_clipboard(char **buffer, size_t *length)
 	clipboard_handle = GetClipboardData(CF_TEXT);
 	if (clipboard_handle != NULL) {
 		content = GlobalLock(clipboard_handle);
-		LOG(("pasting %s", content));
+		LOG("pasting %s", content);
 		GlobalUnlock(clipboard_handle);
 	}
 }
diff --git a/windows/localhistory.c b/windows/localhistory.c
index dfca4a4e1..674f198a0 100644
--- a/windows/localhistory.c
+++ b/windows/localhistory.c
@@ -86,7 +86,7 @@ static void nsws_localhistory_up(struct nsws_localhistory *l, struct gui_window
 		.plot = &win_plotters
 	};
 
-	LOG(("gui window %p", gw));
+	LOG("gui window %p", gw);
 
 	l->vscroll = 0;
 	l->hscroll = 0;
@@ -125,7 +125,7 @@ nsws_localhistory_event_callback(HWND hwnd, UINT msg,
 
 	gw = nsws_get_gui_window(hwnd);
 	if (gw == NULL) {
-		LOG(("Unable to find gui window structure for hwnd %p", hwnd));
+		LOG("Unable to find gui window structure for hwnd %p", hwnd);
 		return DefWindowProc(hwnd, msg, wparam, lparam);
 	}
 
@@ -305,7 +305,7 @@ struct nsws_localhistory *nsws_window_create_localhistory(struct gui_window *gw)
 	int margin = 50;
 	RECT r;
 
-	LOG(("gui window %p", gw));
+	LOG("gui window %p", gw);
 
 	/* if we already have a window, just update and re-show it */
 	if (gw->localhistory != NULL) {
@@ -348,7 +348,7 @@ struct nsws_localhistory *nsws_window_create_localhistory(struct gui_window *gw)
 	InitCommonControlsEx(&icc);
 
 
-	LOG(("creating local history window for hInstance %p", hInstance));
+	LOG("creating local history window for hInstance %p", hInstance);
 	localhistory->hwnd = CreateWindow(windowclassname_localhistory,
 					 "NetSurf History",
 					 WS_THICKFRAME | WS_HSCROLL |
@@ -363,9 +363,7 @@ struct nsws_localhistory *nsws_window_create_localhistory(struct gui_window *gw)
 	/* set the gui window associated with this browser */
 	SetProp(localhistory->hwnd, TEXT("GuiWnd"), (HANDLE)gw);
 
-	LOG(("gui_window %p width %d height %d hwnd %p", gw,
-	     localhistory->guiwidth, localhistory->guiheight,
-	     localhistory->hwnd));
+	LOG("gui_window %p width %d height %d hwnd %p", gw, localhistory->guiwidth, localhistory->guiheight, localhistory->hwnd);
 
 	nsws_localhistory_up(localhistory, gw);
 	UpdateWindow(localhistory->hwnd);
diff --git a/windows/main.c b/windows/main.c
index 4114297d2..1997c85d1 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -189,7 +189,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
 	free(messages);
 	if (ret != NSERROR_OK) {
 		free(options_file_location);
-		LOG(("NetSurf failed to initialise"));
+		LOG("NetSurf failed to initialise");
 		return 1;
 	}
 
@@ -210,7 +210,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
 		addr = NETSURF_HOMEPAGE;
 	}
 
-	LOG(("calling browser_window_create"));
+	LOG("calling browser_window_create");
 
 	ret = nsurl_create(addr, &url);
 	if (ret == NSERROR_OK) {
diff --git a/windows/plot.c b/windows/plot.c
index 6c3e2e0ce..4b281162a 100644
--- a/windows/plot.c
+++ b/windows/plot.c
@@ -69,7 +69,7 @@ static bool line(int x0, int y0, int x1, int y1, const plot_style_t *style)
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -124,7 +124,7 @@ static bool rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style)
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -191,7 +191,7 @@ static bool polygon(const int *p, unsigned int n, const plot_style_t *style)
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -262,7 +262,7 @@ static bool text(int x, int y, const char *text, size_t length,
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -321,7 +321,7 @@ static bool disc(int x, int y, int radius, const plot_style_t *style)
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -392,7 +392,7 @@ static bool arc(int x, int y, int radius, int angle1, int angle2,
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -505,7 +505,7 @@ plot_block(COLORREF col, int x, int y, int width, int height)
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -690,7 +690,7 @@ plot_bitmap(struct bitmap *bitmap, int x, int y, int width, int height)
 
 	/* ensure the plot HDC is set */
 	if (plot_hdc == NULL) {
-		LOG(("HDC not set on call to plotters"));
+		LOG("HDC not set on call to plotters");
 		return false;
 	}
 
@@ -758,7 +758,7 @@ windows_plot_bitmap(int x, int y,
 	PLOT_LOG(("Plotting %p at %d,%d by %d,%d",bitmap, x,y,width,height));
 
 	if (bitmap == NULL) {
-		LOG(("Passed null bitmap!"));
+		LOG("Passed null bitmap!");
 		return true;
 	}
 
diff --git a/windows/schedule.c b/windows/schedule.c
index 4aac981ef..428aa227c 100644
--- a/windows/schedule.c
+++ b/windows/schedule.c
@@ -216,13 +216,12 @@ void list_schedule(void)
 
 	gettimeofday(&tv, NULL);
 
-        LOG(("schedule list at %ld:%ld", tv.tv_sec, tv.tv_usec));
+        LOG("schedule list at %ld:%ld", tv.tv_sec, tv.tv_usec);
 
         cur_nscb = schedule_list;
 
         while (cur_nscb != NULL) {
-                LOG(("Schedule %p at %ld:%ld",
-                     cur_nscb, cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec));
+                LOG("Schedule %p at %ld:%ld", cur_nscb, cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec);
                 cur_nscb = cur_nscb->next;
         }
 }
diff --git a/windows/window.c b/windows/window.c
index ece8b341a..3775af118 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -74,7 +74,7 @@ static int get_window_dpi(HWND hwnd)
 
 	ReleaseDC(hwnd, hdc);
 
-	LOG(("FIX DPI %d", dpi));
+	LOG("FIX DPI %d", dpi);
 
 	return dpi;
 }
@@ -133,7 +133,7 @@ static HWND nsws_window_create(struct gui_window *gw)
 	HWND hwnd;
 	INITCOMMONCONTROLSEX icc;
 
-	LOG(("GUI window %p", gw));
+	LOG("GUI window %p", gw);
 
 	icc.dwSize = sizeof(icc);
 	icc.dwICC = ICC_BAR_CLASSES | ICC_WIN95_CLASSES;
@@ -145,7 +145,7 @@ static HWND nsws_window_create(struct gui_window *gw)
 	gw->mainmenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MENU_MAIN));
 	gw->rclick = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MENU_CONTEXT));
 
-	LOG(("creating window for hInstance %p", hInstance));
+	LOG("creating window for hInstance %p", hInstance);
 	hwnd = CreateWindowEx(0,
 			      windowclassname_main,
 			      "NetSurf Browser",
@@ -160,7 +160,7 @@ static HWND nsws_window_create(struct gui_window *gw)
 			      NULL);
 
 	if (hwnd == NULL) {
-		LOG(("Window create failed"));
+		LOG("Window create failed");
 		return NULL;
 	}
 
@@ -173,9 +173,7 @@ static HWND nsws_window_create(struct gui_window *gw)
 	    (nsoption_int(window_height) >= 100) &&
 	    (nsoption_int(window_x) >= 0) &&
 	    (nsoption_int(window_y) >= 0)) {
-		LOG(("Setting Window position %d,%d %d,%d",
-		     nsoption_int(window_x), nsoption_int(window_y),
-		     nsoption_int(window_width), nsoption_int(window_height)));
+		LOG("Setting Window position %d,%d %d,%d", nsoption_int(window_x), nsoption_int(window_y), nsoption_int(window_width), nsoption_int(window_height));
 		SetWindowPos(hwnd, HWND_TOP,
 			     nsoption_int(window_x), nsoption_int(window_y),
 			     nsoption_int(window_width), nsoption_int(window_height),
@@ -218,47 +216,46 @@ nsws_window_toolbar_command(struct gui_window *gw,
 		    int identifier,
 		    HWND ctrl_window)
 {
-	LOG(("notification_code %d identifier %d ctrl_window %p",
-	     notification_code, identifier,  ctrl_window));
+	LOG("notification_code %d identifier %d ctrl_window %p", notification_code, identifier, ctrl_window);
 
 	switch(identifier) {
 
 	case IDC_MAIN_URLBAR:
 		switch (notification_code) {
 		case EN_CHANGE:
-			LOG(("EN_CHANGE"));
+			LOG("EN_CHANGE");
 			break;
 
 		case EN_ERRSPACE:
-			LOG(("EN_ERRSPACE"));
+			LOG("EN_ERRSPACE");
 			break;
 
 		case EN_HSCROLL:
-			LOG(("EN_HSCROLL"));
+			LOG("EN_HSCROLL");
 			break;
 
 		case EN_KILLFOCUS:
-			LOG(("EN_KILLFOCUS"));
+			LOG("EN_KILLFOCUS");
 			break;
 
 		case EN_MAXTEXT:
-			LOG(("EN_MAXTEXT"));
+			LOG("EN_MAXTEXT");
 			break;
 
 		case EN_SETFOCUS:
-			LOG(("EN_SETFOCUS"));
+			LOG("EN_SETFOCUS");
 			break;
 
 		case EN_UPDATE:
-			LOG(("EN_UPDATE"));
+			LOG("EN_UPDATE");
 			break;
 
 		case EN_VSCROLL:
-			LOG(("EN_VSCROLL"));
+			LOG("EN_VSCROLL");
 			break;
 
 		default:
-			LOG(("Unknown notification_code"));
+			LOG("Unknown notification_code");
 			break;
 		}
 		break;
@@ -343,7 +340,7 @@ get_imagelist(int resid, int bsize, int bcnt)
 	HIMAGELIST hImageList;
 	HBITMAP hScrBM;
 
-	LOG(("resource id %d, bzize %d, bcnt %d", resid, bsize, bcnt));
+	LOG("resource id %d, bzize %d, bcnt %d", resid, bsize, bcnt);
 
 	hImageList = ImageList_Create(bsize, bsize, ILC_COLOR24 | ILC_MASK, 0,
 				      bcnt);
@@ -397,7 +394,7 @@ nsws_window_urlbar_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 	case WM_DESTROY:
 		hFont = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0);
 		if (hFont != NULL) {
-			LOG(("Destroyed font object"));
+			LOG("Destroyed font object");
 			DeleteObject(hFont);
 		}
 
@@ -468,11 +465,11 @@ nsws_window_urlbar_create(struct gui_window *gw, HWND hwndparent)
 
 	hFont = CreateFont(urlheight - 4, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, "Arial");
 	if (hFont != NULL) {
-		LOG(("Setting font object"));
+		LOG("Setting font object");
 		SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont, 0);
 	}
 
-	LOG(("Created url bar hwnd:%p, x:%d, y:%d, w:%d, h:%d", hwnd,urlx, urly, urlwidth,  urlheight));
+	LOG("Created url bar hwnd:%p, x:%d, y:%d, w:%d, h:%d", hwnd, urlx, urly, urlwidth, urlheight);
 
 	return hwnd;
 }
@@ -500,7 +497,7 @@ nsws_window_throbber_create(struct gui_window *w)
 			    NULL);
 
 	nsws_find_resource(avi, "throbber.avi", "windows/res/throbber.avi");
-	LOG(("setting throbber avi as %s", avi));
+	LOG("setting throbber avi as %s", avi);
 	Animate_Open(hwnd, avi);
 	if (w->throbbing)
 		Animate_Play(hwnd, 0, -1, -1);
@@ -734,7 +731,7 @@ static void nsws_window_update_forward_back(struct gui_window *w)
 
 static bool win32_window_get_scroll(struct gui_window *w, int *sx, int *sy)
 {
-	LOG(("get scroll"));
+	LOG("get scroll");
 	if (w == NULL)
 		return false;
 
@@ -871,8 +868,7 @@ nsws_window_command(HWND hwnd,
 {
 	nserror ret;
 
-	LOG(("notification_code %x identifier %x ctrl_window %p",
-	     notification_code, identifier,  ctrl_window));
+	LOG("notification_code %x identifier %x ctrl_window %p", notification_code, identifier, ctrl_window);
 
 	switch(identifier) {
 
@@ -951,7 +947,7 @@ nsws_window_command(HWND hwnd,
 		HANDLE h = GetClipboardData(CF_TEXT);
 		if (h != NULL) {
 			char *content = GlobalLock(h);
-			LOG(("pasting %s\n", content));
+			LOG("pasting %s\n", content);
 			GlobalUnlock(h);
 		}
 		CloseClipboard();
@@ -1165,7 +1161,7 @@ nsws_window_command(HWND hwnd,
 		int len = SendMessage(gw->urlbar, WM_GETTEXTLENGTH, 0, 0);
 		char addr[len + 1];
 		SendMessage(gw->urlbar, WM_GETTEXT, (WPARAM)(len + 1), (LPARAM)addr);
-		LOG(("launching %s\n", addr));
+		LOG("launching %s\n", addr);
 
 		if (nsurl_create(addr, &url) != NSERROR_OK) {
 			warn_user("NoMemory", 0);
@@ -1266,7 +1262,7 @@ nsws_window_event_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 
 	gw = nsws_get_gui_window(hwnd);
 	if (gw == NULL) {
-		LOG(("Unable to find gui window structure for hwnd %p", hwnd));
+		LOG("Unable to find gui window structure for hwnd %p", hwnd);
 		return DefWindowProc(hwnd, msg, wparam, lparam);
 	}
 
@@ -1355,7 +1351,7 @@ win32_window_create(struct browser_window *bw,
 {
 	struct gui_window *gw;
 
-	LOG(("Creating gui window for browser window %p", bw));
+	LOG("Creating gui window for browser window %p", bw);
 
 	gw = calloc(1, sizeof(struct gui_window));
 
@@ -1377,7 +1373,7 @@ win32_window_create(struct browser_window *bw,
 	gw->mouse = malloc(sizeof(struct browser_mouse));
 	if (gw->mouse == NULL) {
 		free(gw);
-		LOG(("Unable to allocate mouse state"));
+		LOG("Unable to allocate mouse state");
 		return NULL;
 	}
 	gw->mouse->gui = gw;
@@ -1396,8 +1392,7 @@ win32_window_create(struct browser_window *bw,
 	gw->statusbar = nsws_window_create_statusbar(gw);
 	gw->drawingarea = nsws_window_create_drawable(hInstance, gw->main, gw);
 
-	LOG(("new window: main:%p toolbar:%p statusbar %p drawingarea %p",
-			gw->main, gw->toolbar, gw->statusbar, gw->drawingarea));
+	LOG("new window: main:%p toolbar:%p statusbar %p drawingarea %p", gw->main, gw->toolbar, gw->statusbar, gw->drawingarea);
 
 	font_hwnd = gw->drawingarea;
 	open_windows++;
@@ -1462,7 +1457,7 @@ static void win32_window_get_dimensions(struct gui_window *w, int *width, int *h
 	if (w == NULL)
 		return;
 
-	LOG(("get dimensions %p w=%d h=%d", w, w->width, w->height));
+	LOG("get dimensions %p w=%d h=%d", w, w->width, w->height);
 
 	*width = w->width;
 	*height = w->height;
@@ -1496,7 +1491,7 @@ static void win32_window_set_title(struct gui_window *w, const char *title)
 {
 	if (w == NULL)
 		return;
-	LOG(("%p, title %s", w, title));
+	LOG("%p, title %s", w, title);
 	char *fulltitle = malloc(strlen(title) +
 				 SLEN("  -  NetSurf") + 1);
 	if (fulltitle == NULL) {