Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/8afeffedad0d7c3e63929f2e6a78f2e71aa1f773
...commit
http://git.netsurf-browser.org/netsurf.git/commit/8afeffedad0d7c3e63929f2e6a78f2e71aa1f773
...tree
http://git.netsurf-browser.org/netsurf.git/tree/8afeffedad0d7c3e63929f2e6a78f2e71aa1f773
The branch, master has been updated
via 8afeffedad0d7c3e63929f2e6a78f2e71aa1f773 (commit)
via d2d5ef276b40e124ad93a995704e371929d22a70 (commit)
from 4cea5a853bf0a5072a6599a0eee0f2b603708b86 (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=8afeffedad0d7c3e63929f2e6a78f2e71aa1f773
commit 8afeffedad0d7c3e63929f2e6a78f2e71aa1f773
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix warning due to undefined bitmap structure
diff --git a/desktop/browser_history.h b/desktop/browser_history.h
index d202119..9b6f1fd 100644
--- a/desktop/browser_history.h
+++ b/desktop/browser_history.h
@@ -37,6 +37,7 @@
struct browser_window;
struct history_entry;
+struct bitmap;
/**
* Go back in the history.
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d2d5ef276b40e124ad93a995704e371929d22a70
commit d2d5ef276b40e124ad93a995704e371929d22a70
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
annotate error case fall through in switch to supress warnings
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 8933fc9..c07cac9 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -299,6 +299,8 @@ search_web_ico_callback(hlcache_handle *ico,
NSLOG(netsurf, INFO, "icon %s error: %s",
nsurl_access(hlcache_handle_get_url(ico)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(ico);
/* clear reference to released handle */
@@ -457,6 +459,8 @@ default_ico_callback(hlcache_handle *ico,
NSLOG(netsurf, INFO, "icon %s error: %s",
nsurl_access(hlcache_handle_get_url(ico)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(ico);
/* clear reference to released handle */
diff --git a/render/html_css.c b/render/html_css.c
index 303bee6..45bc16f 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -113,6 +113,8 @@ html_convert_css_callback(hlcache_handle *css,
NSLOG(netsurf, INFO, "stylesheet %s failed: %s",
nsurl_access(hlcache_handle_get_url(css)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(css);
s->sheet = NULL;
diff --git a/render/html_script.c b/render/html_script.c
index 186e520..c73a480 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -96,7 +96,7 @@ nserror html_script_exec(html_content *c)
s->already_started = true;
- }
+ }
}
}
@@ -105,8 +105,8 @@ nserror html_script_exec(html_content *c)
/* create new html script entry */
static struct html_script *
-html_process_new_script(html_content *c,
- dom_string *mimetype,
+html_process_new_script(html_content *c,
+ dom_string *mimetype,
enum html_script_type type)
{
struct html_script *nscript;
@@ -176,6 +176,8 @@ convert_script_async_cb(hlcache_handle *script,
NSLOG(netsurf, INFO, "script %s failed: %s",
nsurl_access(hlcache_handle_get_url(script)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(script);
s->data.handle = NULL;
@@ -233,6 +235,8 @@ convert_script_defer_cb(hlcache_handle *script,
NSLOG(netsurf, INFO, "script %s failed: %s",
nsurl_access(hlcache_handle_get_url(script)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(script);
s->data.handle = NULL;
@@ -301,7 +305,7 @@ convert_script_sync_cb(hlcache_handle *script,
err = dom_hubbub_parser_pause(parent->parser, false);
if (err != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "unpause returned 0x%x", err);
- }
+ }
break;
@@ -309,8 +313,9 @@ convert_script_sync_cb(hlcache_handle *script,
NSLOG(netsurf, INFO, "script %s failed: %s",
nsurl_access(hlcache_handle_get_url(script)),
event->data.error);
- case CONTENT_MSG_ERRORCODE:
+ /* fall through */
+ case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(script);
s->data.handle = NULL;
parent->base.active--;
@@ -324,7 +329,7 @@ convert_script_sync_cb(hlcache_handle *script,
err = dom_hubbub_parser_pause(parent->parser, false);
if (err != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "unpause returned 0x%x", err);
- }
+ }
break;
@@ -376,10 +381,10 @@ exec_src_script(html_content *c,
*
* Syncronously pause the parent parse and continue after
* the script has downloaded and executed. (default)
- * Async Start the script downloading and execute it when it
- * becomes available.
- * Defered Start the script downloading and execute it when
- * the page has completed parsing, may be set along
+ * Async Start the script downloading and execute it when it
+ * becomes available.
+ * Defered Start the script downloading and execute it when
+ * the page has completed parsing, may be set along
* with async where it is ignored.
*/
@@ -388,7 +393,7 @@ exec_src_script(html_content *c,
* value or the attribute name itself are valid. However
* various browsers interpret this in various ways the most
* compatible approach is to be liberal and accept any
- * value. Note setting the values to "false" still makes them true!
+ * value. Note setting the values to "false" still makes them true!
*/
exc = dom_element_has_attribute(node, corestring_dom_async, &async);
if (exc != DOM_NO_ERR) {
@@ -401,7 +406,7 @@ exec_src_script(html_content *c,
script_cb = convert_script_async_cb;
} else {
- exc = dom_element_has_attribute(node,
+ exc = dom_element_has_attribute(node,
corestring_dom_defer, &defer);
if (exc != DOM_NO_ERR) {
return DOM_HUBBUB_OK; /* dom error */
@@ -444,14 +449,14 @@ exec_src_script(html_content *c,
if (ns_error != NSERROR_OK) {
/* @todo Deal with fetch error better. currently assume
- * fetch never became active
+ * fetch never became active
*/
/* mark duff script fetch as already started */
- nscript->already_started = true;
+ nscript->already_started = true;
NSLOG(netsurf, INFO, "Fetch failed with error %d", ns_error);
} else {
/* update base content active fetch count */
- c->base.active++;
+ c->base.active++;
NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
switch (script_type) {
-----------------------------------------------------------------------
Summary of changes:
desktop/browser_history.h | 1 +
desktop/searchweb.c | 4 ++++
render/html_css.c | 2 ++
render/html_script.c | 35 ++++++++++++++++++++---------------
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/desktop/browser_history.h b/desktop/browser_history.h
index d202119..9b6f1fd 100644
--- a/desktop/browser_history.h
+++ b/desktop/browser_history.h
@@ -37,6 +37,7 @@
struct browser_window;
struct history_entry;
+struct bitmap;
/**
* Go back in the history.
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 8933fc9..c07cac9 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -299,6 +299,8 @@ search_web_ico_callback(hlcache_handle *ico,
NSLOG(netsurf, INFO, "icon %s error: %s",
nsurl_access(hlcache_handle_get_url(ico)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(ico);
/* clear reference to released handle */
@@ -457,6 +459,8 @@ default_ico_callback(hlcache_handle *ico,
NSLOG(netsurf, INFO, "icon %s error: %s",
nsurl_access(hlcache_handle_get_url(ico)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(ico);
/* clear reference to released handle */
diff --git a/render/html_css.c b/render/html_css.c
index 303bee6..45bc16f 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -113,6 +113,8 @@ html_convert_css_callback(hlcache_handle *css,
NSLOG(netsurf, INFO, "stylesheet %s failed: %s",
nsurl_access(hlcache_handle_get_url(css)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(css);
s->sheet = NULL;
diff --git a/render/html_script.c b/render/html_script.c
index 186e520..c73a480 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -96,7 +96,7 @@ nserror html_script_exec(html_content *c)
s->already_started = true;
- }
+ }
}
}
@@ -105,8 +105,8 @@ nserror html_script_exec(html_content *c)
/* create new html script entry */
static struct html_script *
-html_process_new_script(html_content *c,
- dom_string *mimetype,
+html_process_new_script(html_content *c,
+ dom_string *mimetype,
enum html_script_type type)
{
struct html_script *nscript;
@@ -176,6 +176,8 @@ convert_script_async_cb(hlcache_handle *script,
NSLOG(netsurf, INFO, "script %s failed: %s",
nsurl_access(hlcache_handle_get_url(script)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(script);
s->data.handle = NULL;
@@ -233,6 +235,8 @@ convert_script_defer_cb(hlcache_handle *script,
NSLOG(netsurf, INFO, "script %s failed: %s",
nsurl_access(hlcache_handle_get_url(script)),
event->data.error);
+ /* fall through */
+
case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(script);
s->data.handle = NULL;
@@ -301,7 +305,7 @@ convert_script_sync_cb(hlcache_handle *script,
err = dom_hubbub_parser_pause(parent->parser, false);
if (err != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "unpause returned 0x%x", err);
- }
+ }
break;
@@ -309,8 +313,9 @@ convert_script_sync_cb(hlcache_handle *script,
NSLOG(netsurf, INFO, "script %s failed: %s",
nsurl_access(hlcache_handle_get_url(script)),
event->data.error);
- case CONTENT_MSG_ERRORCODE:
+ /* fall through */
+ case CONTENT_MSG_ERRORCODE:
hlcache_handle_release(script);
s->data.handle = NULL;
parent->base.active--;
@@ -324,7 +329,7 @@ convert_script_sync_cb(hlcache_handle *script,
err = dom_hubbub_parser_pause(parent->parser, false);
if (err != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "unpause returned 0x%x", err);
- }
+ }
break;
@@ -376,10 +381,10 @@ exec_src_script(html_content *c,
*
* Syncronously pause the parent parse and continue after
* the script has downloaded and executed. (default)
- * Async Start the script downloading and execute it when it
- * becomes available.
- * Defered Start the script downloading and execute it when
- * the page has completed parsing, may be set along
+ * Async Start the script downloading and execute it when it
+ * becomes available.
+ * Defered Start the script downloading and execute it when
+ * the page has completed parsing, may be set along
* with async where it is ignored.
*/
@@ -388,7 +393,7 @@ exec_src_script(html_content *c,
* value or the attribute name itself are valid. However
* various browsers interpret this in various ways the most
* compatible approach is to be liberal and accept any
- * value. Note setting the values to "false" still makes them true!
+ * value. Note setting the values to "false" still makes them true!
*/
exc = dom_element_has_attribute(node, corestring_dom_async, &async);
if (exc != DOM_NO_ERR) {
@@ -401,7 +406,7 @@ exec_src_script(html_content *c,
script_cb = convert_script_async_cb;
} else {
- exc = dom_element_has_attribute(node,
+ exc = dom_element_has_attribute(node,
corestring_dom_defer, &defer);
if (exc != DOM_NO_ERR) {
return DOM_HUBBUB_OK; /* dom error */
@@ -444,14 +449,14 @@ exec_src_script(html_content *c,
if (ns_error != NSERROR_OK) {
/* @todo Deal with fetch error better. currently assume
- * fetch never became active
+ * fetch never became active
*/
/* mark duff script fetch as already started */
- nscript->already_started = true;
+ nscript->already_started = true;
NSLOG(netsurf, INFO, "Fetch failed with error %d", ns_error);
} else {
/* update base content active fetch count */
- c->base.active++;
+ c->base.active++;
NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
switch (script_type) {
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
