summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2017-09-11 15:43:25 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2017-09-11 15:43:25 (GMT)
commitd2d5ef276b40e124ad93a995704e371929d22a70 (patch)
tree488ed345c13e308b3fdac361f534bf82db08b7ba
parent4cea5a853bf0a5072a6599a0eee0f2b603708b86 (diff)
downloadnetsurf-d2d5ef276b40e124ad93a995704e371929d22a70.tar.gz
netsurf-d2d5ef276b40e124ad93a995704e371929d22a70.tar.bz2
annotate error case fall through in switch to supress warnings
-rw-r--r--desktop/searchweb.c4
-rw-r--r--render/html_css.c2
-rw-r--r--render/html_script.c35
3 files changed, 26 insertions, 15 deletions
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) {