From fcb7143ecb0c1acedfb30d34931896dbefc660b1 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Wed, 15 Aug 2012 11:50:08 +0100
Subject: Simplify content status text setting.

---
 content/content.c           | 53 ++++++++++++++++++++-------------------------
 content/content_protected.h |  2 +-
 render/html.c               |  3 +--
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/content/content.c b/content/content.c
index b80626cdf..8b089cd1e 100644
--- a/content/content.c
+++ b/content/content.c
@@ -59,7 +59,6 @@ const char * const content_status_name[] = {
 static nserror content_llcache_callback(llcache_handle *llcache,
 		const llcache_event *event, void *pw);
 static void content_convert(struct content *c);
-static void content_update_status(struct content *c);
 
 
 /**
@@ -169,7 +168,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
 
 		(void) llcache_handle_get_source_data(llcache, &source_size);
 
-		content_set_status(c, messages_get("Processing"), source_size);
+		content_set_status(c, messages_get("Processing"));
 		content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
 
 		content_convert(c);
@@ -182,7 +181,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
 		content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
 		break;
 	case LLCACHE_EVENT_PROGRESS:
-		content_set_status(c, "%s", event->data.msg);
+		content_set_status(c, event->data.msg);
 		content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
 		break;
 	}
@@ -207,31 +206,7 @@ bool content_can_reformat(hlcache_handle *h)
 }
 
 
-/**
- * Updates content with new status.
- *
- * The textual status contained in the content is updated with given string.
- *
- * \param status_message new textual status
- */
-
-void content_set_status(struct content *c, const char *status_message, ...)
-{
-	va_list ap;
-	int len;
-
-	va_start(ap, status_message);
-	if ((len = vsnprintf(c->sub_status, sizeof (c->sub_status),
-			status_message, ap)) < 0 ||
-			(int)sizeof (c->sub_status) <= len)
-		c->sub_status[sizeof (c->sub_status) - 1] = '\0';
-	va_end(ap);
-
-	content_update_status(c);
-}
-
-
-void content_update_status(struct content *c)
+static void content_update_status(struct content *c)
 {
 	if (c->status == CONTENT_STATUS_LOADING ||
 			c->status == CONTENT_STATUS_READY) {
@@ -245,8 +220,28 @@ void content_update_status(struct content *c)
 				"%s (%.1fs)", messages_get("Done"),
 				(float) time / 100);
 	}
+}
+
+
+/**
+ * Updates content with new status.
+ *
+ * The textual status contained in the content is updated with given string.
+ *
+ * \param status_message  new textual status
+ */
+
+void content_set_status(struct content *c, const char *status_message)
+{
+	size_t len = strlen(status_message);
 
-	/* LOG(("%s", c->status_message)); */
+	if (len >= sizeof(c->sub_status)) {
+		len = sizeof(c->sub_status) - 1;
+	}
+	memcpy(c->sub_status, status_message, len);
+	c->sub_status[len] = '\0';
+
+	content_update_status(c);
 }
 
 
diff --git a/content/content_protected.h b/content/content_protected.h
index ad0b0afa6..e37573493 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -160,7 +160,7 @@ void content_set_ready(struct content *c);
 void content_set_done(struct content *c);
 void content_set_error(struct content *c);
 
-void content_set_status(struct content *c, const char *status_message, ...);
+void content_set_status(struct content *c, const char *status_message);
 void content_broadcast(struct content *c, content_msg msg,
 		union content_msg_data data);
 void content_add_error(struct content *c, const char *token,
diff --git a/render/html.c b/render/html.c
index 00992967e..fc2f2b8b7 100644
--- a/render/html.c
+++ b/render/html.c
@@ -32,7 +32,6 @@
 #include "content/content_protected.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
 #include "desktop/options.h"
 #include "desktop/selection.h"
 #include "desktop/scrollbar.h"
@@ -2510,7 +2509,7 @@ static nserror html_clone(const struct content *old, struct content **newc)
 
 void html_set_status(html_content *c, const char *extra)
 {
-	content_set_status(&c->base, "%s", extra);
+	content_set_status(&c->base, extra);
 }
 
 
-- 
cgit v1.2.3