diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2010-08-26 23:00:23 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-08-26 23:00:23 +0000 |
commit | 229af12d7ab2c071a6888eb8ffc49bb0bbeb9ddd (patch) | |
tree | 78100a859a1bf8fbb9d2166dd0843c49c98c53c3 /src/utils | |
parent | 5c109b370a014e49387320fa23bb589e4d4e36f1 (diff) | |
download | libdom-229af12d7ab2c071a6888eb8ffc49bb0bbeb9ddd.tar.gz libdom-229af12d7ab2c071a6888eb8ffc49bb0bbeb9ddd.tar.bz2 |
Sync with modified libwapcaplet API: 11 additional DOM Level1 testsuite failures. Most importantly, it actually compiles now.
svn path=/trunk/dom/; revision=10717
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/resource_mgr.c | 11 | ||||
-rw-r--r-- | src/utils/resource_mgr.h | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/utils/resource_mgr.c b/src/utils/resource_mgr.c index c9c86d3..98270ee 100644 --- a/src/utils/resource_mgr.c +++ b/src/utils/resource_mgr.c @@ -13,6 +13,8 @@ #include <libwapcaplet/libwapcaplet.h> #include "core/string.h" +#include "utils/utils.h" + /** * Allocate some memory with this allocator * @@ -55,10 +57,9 @@ dom_exception _dom_resource_mgr_create_lwcstring(struct dom_resource_mgr *res, { lwc_error lerr; - assert(res->ctx != NULL); + UNUSED(res); - lerr = lwc_context_intern(res->ctx, (const char *) data, len, - result); + lerr = lwc_intern_string((const char *) data, len, result); return _dom_exception_from_lwc_error(lerr); } @@ -75,9 +76,7 @@ dom_exception _dom_resource_mgr_create_string_from_lwcstring( struct dom_resource_mgr *res, struct lwc_string_s *str, struct dom_string **result) { - assert(res->ctx != NULL); - - return _dom_string_create_from_lwcstring(res->alloc, res->pw, res->ctx, + return _dom_string_create_from_lwcstring(res->alloc, res->pw, str, result); } diff --git a/src/utils/resource_mgr.h b/src/utils/resource_mgr.h index b58f665..608df53 100644 --- a/src/utils/resource_mgr.h +++ b/src/utils/resource_mgr.h @@ -13,7 +13,6 @@ #include "hashtable.h" -struct lwc_context_s; struct lwc_string_s; struct dom_string; @@ -23,7 +22,6 @@ struct dom_string; typedef struct dom_resource_mgr { dom_alloc alloc; void *pw; - struct lwc_context_s *ctx; } dom_resource_mgr; void *_dom_resource_mgr_alloc(struct dom_resource_mgr *res, void *ptr, |