Merge remote-tracking branch 'origin/master' into svenw/cocoa

1 files changed, 15 insertions, 11 deletions

diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index d6fb2feb1..9a88ad180 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -168,7 +168,7 @@ static bool save_complete_save_buffer(save_complete_ctx *ctx,
 	fp = fopen(fname, "wb");
 	if (fp == NULL) {
 		free(fname);
-		LOG("fopen(): errno = %i", errno);
+		NSLOG(netsurf, INFO, "fopen(): errno = %i", errno);
 		guit->misc->warning("SaveError", strerror(errno));
 		return false;
 	}
@@ -195,10 +195,12 @@ static bool save_complete_save_buffer(save_complete_ctx *ctx,
  * \param osize updated with the size of the result.
  * \return converted source, or NULL on out of memory.
  */
-
-static char *save_complete_rewrite_stylesheet_urls(save_complete_ctx *ctx,
-		const char *source, unsigned long size, const nsurl *base,
-		unsigned long *osize)
+static char *
+save_complete_rewrite_stylesheet_urls(save_complete_ctx *ctx,
+				      const char *source,
+				      unsigned long size,
+				      const nsurl *base,
+				      unsigned long *osize)
 {
 	char *rewritten;
 	unsigned long offset = 0;
@@ -207,8 +209,9 @@ static char *save_complete_rewrite_stylesheet_urls(save_complete_ctx *ctx,
 
 	/* count number occurrences of @import to (over)estimate result size */
 	/* can't use strstr because source is not 0-terminated string */
-	for (offset = 0; SLEN("@import") < size &&
-			offset <= size - SLEN("@import"); offset++) {
+	for (offset = 0;
+	     (SLEN("@import") < size) && (offset <= (size - SLEN("@import")));
+	     offset++) {
 		if (source[offset] == '@' &&
 		    ascii_to_lower(source[offset + 1]) == 'i' &&
 		    ascii_to_lower(source[offset + 2]) == 'm' &&
@@ -1044,7 +1047,7 @@ static bool save_complete_node_handler(dom_node *node,
 	} else if (type == DOM_DOCUMENT_NODE) {
 		/* Do nothing */
 	} else {
-		LOG("Unhandled node type: %d", type);
+		NSLOG(netsurf, INFO, "Unhandled node type: %d", type);
 	}
 
 	return true;
@@ -1075,7 +1078,7 @@ static bool save_complete_save_html_document(save_complete_ctx *ctx,
 	fp = fopen(fname, "wb");
 	if (fp == NULL) {
 		free(fname);
-		LOG("fopen(): errno = %i", errno);
+		NSLOG(netsurf, INFO, "fopen(): errno = %i", errno);
 		guit->misc->warning("SaveError", strerror(errno));
 		return false;
 	}
@@ -1154,7 +1157,7 @@ static bool save_complete_inventory(save_complete_ctx *ctx)
 	fp = fopen(fname, "w");
 	free(fname);
 	if (fp == NULL) {
-		LOG("fopen(): errno = %i", errno);
+		NSLOG(netsurf, INFO, "fopen(): errno = %i", errno);
 		guit->misc->warning("SaveError", strerror(errno));
 		return false;
 	}
@@ -1182,7 +1185,8 @@ static nserror regcomp_wrapper(regex_t *preg, const char *regex, int cflags)
 	if (r) {
 		char errbuf[200];
 		regerror(r, preg, errbuf, sizeof errbuf);
-		LOG("Failed to compile regexp '%s': %s\n", regex, errbuf);
+		NSLOG(netsurf, INFO, "Failed to compile regexp '%s': %s\n",
+		      regex, errbuf);
 		return NSERROR_INIT_FAILED;
 	}
 	return NSERROR_OK;