summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2004-06-08 20:25:04 +0000
committerJohn Tytgat <joty@netsurf-browser.org>2004-06-08 20:25:04 +0000
commit6790d477d5f48bdf52a99f0269e47456ff972412 (patch)
treeef9ebf03e1f63c41aa9107bc70e3e02ad8afa068 /content
parente3833d52a2b4d3b18e74b92fb1ed76627b186751 (diff)
downloadnetsurf-6790d477d5f48bdf52a99f0269e47456ff972412.tar.gz
netsurf-6790d477d5f48bdf52a99f0269e47456ff972412.tar.bz2
[project @ 2004-06-08 20:25:04 by joty]
- fetchcache_error_page() : small optimisation. - removed compiler warning svn path=/import/netsurf/; revision=936
Diffstat (limited to 'content')
-rw-r--r--content/fetchcache.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/content/fetchcache.c b/content/fetchcache.c
index ed958882e..164a11231 100644
--- a/content/fetchcache.c
+++ b/content/fetchcache.c
@@ -151,7 +151,7 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size)
unsigned int i;
union content_msg_data msg_data;
- c->lock++;
+ c->lock++;
switch (msg) {
case FETCH_TYPE:
@@ -165,7 +165,7 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size)
free(params[i]);
free(params);
if (c->cache && c->type == CONTENT_OTHER)
- cache_destroy(c);
+ cache_destroy(c);
break;
case FETCH_DATA:
@@ -175,7 +175,7 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size)
messages_get("RecPercent"),
human_friendly_bytesize(c->source_size + size),
human_friendly_bytesize(c->total_size),
- (unsigned int) ((c->source_size + size) * 100.0 / c->total_size));
+ (unsigned int) ((c->source_size + size) * 100 / c->total_size));
else
content_set_status(c,
messages_get("Received"),
@@ -228,13 +228,13 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size)
break;
#ifdef WITH_AUTH
case FETCH_AUTH:
- /* data -> string containing the Realm */
- LOG(("FETCH_AUTH, '%s'", data));
- c->fetch = 0;
- msg_data.auth_realm = data;
- content_broadcast(c, CONTENT_MSG_AUTH, msg_data);
- cache_destroy(c);
- break;
+ /* data -> string containing the Realm */
+ LOG(("FETCH_AUTH, '%s'", data));
+ c->fetch = 0;
+ msg_data.auth_realm = data;
+ content_broadcast(c, CONTENT_MSG_AUTH, msg_data);
+ cache_destroy(c);
+ break;
#endif
default:
assert(0);
@@ -311,9 +311,13 @@ char *fetchcache_parse_type(char *s, char **params[])
void fetchcache_error_page(struct content *c, const char *error)
{
const char *params[] = { 0 };
- snprintf(error_page, sizeof error_page, messages_get("ErrorPage"), error);
+ int length;
+
+ if ((length = snprintf(error_page, sizeof(error_page),
+ messages_get("ErrorPage"), error)) < 0)
+ length = 0;
content_set_type(c, CONTENT_HTML, "text/html", params);
- content_process_data(c, error_page, strlen(error_page));
+ content_process_data(c, error_page, length);
content_convert(c, c->width, c->height);
}