Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/137bba297832fca352cf99a5fc0251ba3e251d91
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/137bba297832fca352cf99a5fc0251ba3e251d91
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/137bba297832fca352cf99a5fc0251ba3e251d91

The branch, master has been updated
       via  137bba297832fca352cf99a5fc0251ba3e251d91 (commit)
       via  ad5db89b499d4737b8d6cc20d1e1dcf1efcb6440 (commit)
      from  2eef2a22647a9ea1501c6eb6897afc3c31d33c4f (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/commitdiff/137bba297832fca352cf99a5fc0251ba3e251d91
commit 137bba297832fca352cf99a5fc0251ba3e251d91
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    fix missing check of lwc_string_caseless_isequal() return value

diff --git a/content/content.c b/content/content.c
index f39ba91..b80626c 100644
--- a/content/content.c
+++ b/content/content.c
@@ -788,8 +788,8 @@ content_find_rfc5988_link(hlcache_handle *h, lwc_string 
*rel)
        bool rel_match = false;
 
        while (link != NULL) {
-               lwc_string_caseless_isequal(link->rel, rel, &rel_match);
-               if (rel_match) {
+               if (lwc_string_caseless_isequal(link->rel, rel,
+                               &rel_match) == lwc_error_ok && rel_match) {
                        break;
                }
                link = link->next;


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/ad5db89b499d4737b8d6cc20d1e1dcf1efcb6440
commit ad5db89b499d4737b8d6cc20d1e1dcf1efcb6440
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    Fix include and structure definition to stop compiler redefinition errors

diff --git a/javascript/jsapi.h b/javascript/jsapi.h
index 98b7d02..2c10d02 100644
--- a/javascript/jsapi.h
+++ b/javascript/jsapi.h
@@ -29,6 +29,8 @@
 #include "mozjs/jsapi.h"
 #endif
 
+#include "render/html_internal.h"
+
 #if JS_VERSION <= 180
 
 #include <string.h>
@@ -136,9 +138,6 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
 
 #endif
 
-typedef struct dom_element dom_element;
-typedef struct html_content html_content;
-
 /** Create a new javascript window object
  *
  * @param cx The javascript context.
diff --git a/javascript/jsapi/console.c b/javascript/jsapi/console.c
index 6a3cc18..6a6d7d3 100644
--- a/javascript/jsapi/console.c
+++ b/javascript/jsapi/console.c
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "javascript/jsapi.h"
 
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 static JSBool JSAPI_NATIVE(debug, JSContext *cx, uintN argc, jsval *vp)
 {
        JSAPI_SET_RVAL(cx, vp, JSVAL_VOID);
diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c
index 77de4e0..a40ce20 100644
--- a/javascript/jsapi/document.c
+++ b/javascript/jsapi/document.c
@@ -18,12 +18,11 @@
 
 #include <dom/dom.h>
 
-
-#include "javascript/jsapi.h"
 #include "utils/config.h"
-#include "render/html_internal.h"
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 /* IDL 
http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-document
 
 CAUTION - write, writeln are not part of the DOM they come from:
diff --git a/javascript/jsapi/element.c b/javascript/jsapi/element.c
index 7878393..8ea7017 100644
--- a/javascript/jsapi/element.c
+++ b/javascript/jsapi/element.c
@@ -18,11 +18,11 @@
 
 #include <dom/dom.h>
 
-
-#include "javascript/jsapi.h"
 #include "utils/config.h"
-#include "render/html_internal.h"
 #include "utils/log.h"
+#include "render/html_internal.h"
+
+#include "javascript/jsapi.h"
 
 /* IDL 
http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element
 
diff --git a/javascript/jsapi/navigator.c b/javascript/jsapi/navigator.c
index 64f30c9..88fc535 100644
--- a/javascript/jsapi/navigator.c
+++ b/javascript/jsapi/navigator.c
@@ -19,8 +19,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "javascript/jsapi.h"
-
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
 
@@ -29,6 +27,8 @@
 #include "utils/log.h"
 #include "utils/utsname.h"
 
+#include "javascript/jsapi.h"
+
 /*
  * navigator properties for netsurf
  * 
diff --git a/javascript/jsapi/window.c b/javascript/jsapi/window.c
index 0b7673b..4f7e751 100644
--- a/javascript/jsapi/window.c
+++ b/javascript/jsapi/window.c
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "javascript/jsapi.h"
-
-#include "content/content.h"
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 /* IDL
 
 [NamedPropertiesObject]


-----------------------------------------------------------------------

Summary of changes:
 content/content.c            |    4 ++--
 javascript/jsapi.h           |    5 ++---
 javascript/jsapi/console.c   |    3 ++-
 javascript/jsapi/document.c  |    5 ++---
 javascript/jsapi/element.c   |    6 +++---
 javascript/jsapi/navigator.c |    4 ++--
 javascript/jsapi/window.c    |    5 ++---
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/content/content.c b/content/content.c
index f39ba91..b80626c 100644
--- a/content/content.c
+++ b/content/content.c
@@ -788,8 +788,8 @@ content_find_rfc5988_link(hlcache_handle *h, lwc_string 
*rel)
        bool rel_match = false;
 
        while (link != NULL) {
-               lwc_string_caseless_isequal(link->rel, rel, &rel_match);
-               if (rel_match) {
+               if (lwc_string_caseless_isequal(link->rel, rel,
+                               &rel_match) == lwc_error_ok && rel_match) {
                        break;
                }
                link = link->next;
diff --git a/javascript/jsapi.h b/javascript/jsapi.h
index 98b7d02..2c10d02 100644
--- a/javascript/jsapi.h
+++ b/javascript/jsapi.h
@@ -29,6 +29,8 @@
 #include "mozjs/jsapi.h"
 #endif
 
+#include "render/html_internal.h"
+
 #if JS_VERSION <= 180
 
 #include <string.h>
@@ -136,9 +138,6 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
 
 #endif
 
-typedef struct dom_element dom_element;
-typedef struct html_content html_content;
-
 /** Create a new javascript window object
  *
  * @param cx The javascript context.
diff --git a/javascript/jsapi/console.c b/javascript/jsapi/console.c
index 6a3cc18..6a6d7d3 100644
--- a/javascript/jsapi/console.c
+++ b/javascript/jsapi/console.c
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "javascript/jsapi.h"
 
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 static JSBool JSAPI_NATIVE(debug, JSContext *cx, uintN argc, jsval *vp)
 {
        JSAPI_SET_RVAL(cx, vp, JSVAL_VOID);
diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c
index 77de4e0..a40ce20 100644
--- a/javascript/jsapi/document.c
+++ b/javascript/jsapi/document.c
@@ -18,12 +18,11 @@
 
 #include <dom/dom.h>
 
-
-#include "javascript/jsapi.h"
 #include "utils/config.h"
-#include "render/html_internal.h"
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 /* IDL 
http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-document
 
 CAUTION - write, writeln are not part of the DOM they come from:
diff --git a/javascript/jsapi/element.c b/javascript/jsapi/element.c
index 7878393..8ea7017 100644
--- a/javascript/jsapi/element.c
+++ b/javascript/jsapi/element.c
@@ -18,11 +18,11 @@
 
 #include <dom/dom.h>
 
-
-#include "javascript/jsapi.h"
 #include "utils/config.h"
-#include "render/html_internal.h"
 #include "utils/log.h"
+#include "render/html_internal.h"
+
+#include "javascript/jsapi.h"
 
 /* IDL 
http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element
 
diff --git a/javascript/jsapi/navigator.c b/javascript/jsapi/navigator.c
index 64f30c9..88fc535 100644
--- a/javascript/jsapi/navigator.c
+++ b/javascript/jsapi/navigator.c
@@ -19,8 +19,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "javascript/jsapi.h"
-
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
 
@@ -29,6 +27,8 @@
 #include "utils/log.h"
 #include "utils/utsname.h"
 
+#include "javascript/jsapi.h"
+
 /*
  * navigator properties for netsurf
  * 
diff --git a/javascript/jsapi/window.c b/javascript/jsapi/window.c
index 0b7673b..4f7e751 100644
--- a/javascript/jsapi/window.c
+++ b/javascript/jsapi/window.c
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "javascript/jsapi.h"
-
-#include "content/content.h"
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 /* IDL
 
 [NamedPropertiesObject]


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to