Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/4c256408c5b21d20bf703571ba106f7bb6101ada
...commit
http://git.netsurf-browser.org/netsurf.git/commit/4c256408c5b21d20bf703571ba106f7bb6101ada
...tree
http://git.netsurf-browser.org/netsurf.git/tree/4c256408c5b21d20bf703571ba106f7bb6101ada
The branch, master has been updated
via 4c256408c5b21d20bf703571ba106f7bb6101ada (commit)
via 02c5bde5a9f8a931ddeff425154bf63ebd82fce3 (commit)
from fa75e8e4fdc8b8620a8d19db612b4bf74d9d16c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=4c256408c5b21d20bf703571ba106f7bb6101ada
commit 4c256408c5b21d20bf703571ba106f7bb6101ada
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
fetch: Bump last_msg rather than always assigning it
If we are aborting a cURL fetch then it's possible entry to
cURL to clean up could cause a PROGRESS message to happen which
we need to not reset last_msg for, otherwise we spuriously attempt
to send an ERROR message during abort which is not a safe time for
our message callback to be used.
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/fetch.c b/content/fetch.c
index 331b5f4..807e811 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -804,7 +804,9 @@ fetch_multipart_data_new_kv(struct fetch_multipart_data
**list,
void
fetch_send_callback(const fetch_msg *msg, struct fetch *fetch)
{
- fetch->last_msg = msg->type;
+ /* Bump the last_msg to the greatest seen msg */
+ if (msg->type > fetch->last_msg)
+ fetch->last_msg = msg->type;
fetch->callback(msg, fetch->p);
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=02c5bde5a9f8a931ddeff425154bf63ebd82fce3
commit 02c5bde5a9f8a931ddeff425154bf63ebd82fce3
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
fs_backing_store: Fix some comparison types
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index c2eeb4f..ff1c265 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -667,7 +667,7 @@ write_entry(struct store_entry *ent, int fd)
uint32_t len = strlen(nsurl_access(ent->url));
if (write(fd, &len, sizeof(len)) != sizeof(len))
return NSERROR_SAVE_FAILED;
- if (write(fd, nsurl_access(ent->url), len) != len)
+ if (write(fd, nsurl_access(ent->url), len) != (ssize_t)len)
return NSERROR_SAVE_FAILED;
if (write(fd, ent, sizeof(*ent)) != sizeof(*ent))
return NSERROR_SAVE_FAILED;
@@ -1164,7 +1164,7 @@ read_entries(struct store_state *state)
free(fname);
return NSERROR_NOMEM;
}
- if (read(fd, url, urllen) != urllen) {
+ if (read(fd, url, urllen) != (ssize_t)urllen) {
free(url);
close(fd);
free(fname);
-----------------------------------------------------------------------
Summary of changes:
content/fetch.c | 4 +++-
content/fs_backing_store.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/content/fetch.c b/content/fetch.c
index 331b5f4..807e811 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -804,7 +804,9 @@ fetch_multipart_data_new_kv(struct fetch_multipart_data
**list,
void
fetch_send_callback(const fetch_msg *msg, struct fetch *fetch)
{
- fetch->last_msg = msg->type;
+ /* Bump the last_msg to the greatest seen msg */
+ if (msg->type > fetch->last_msg)
+ fetch->last_msg = msg->type;
fetch->callback(msg, fetch->p);
}
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index c2eeb4f..ff1c265 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -667,7 +667,7 @@ write_entry(struct store_entry *ent, int fd)
uint32_t len = strlen(nsurl_access(ent->url));
if (write(fd, &len, sizeof(len)) != sizeof(len))
return NSERROR_SAVE_FAILED;
- if (write(fd, nsurl_access(ent->url), len) != len)
+ if (write(fd, nsurl_access(ent->url), len) != (ssize_t)len)
return NSERROR_SAVE_FAILED;
if (write(fd, ent, sizeof(*ent)) != sizeof(*ent))
return NSERROR_SAVE_FAILED;
@@ -1164,7 +1164,7 @@ read_entries(struct store_state *state)
free(fname);
return NSERROR_NOMEM;
}
- if (read(fd, url, urllen) != urllen) {
+ if (read(fd, url, urllen) != (ssize_t)urllen) {
free(url);
close(fd);
free(fname);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
