From 75d7ce5895a98026a3e4b0e03fafc0b3761a07f1 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Mon, 6 Dec 2010 23:15:39 +0000 Subject: Simplify DOMImplementation API by replacing dom_strings with const char * svn path=/trunk/libdom/; revision=11024 --- test/testutils/domtsasserts.c | 25 +++++++------------------ test/testutils/domtsasserts.h | 2 +- 2 files changed, 8 insertions(+), 19 deletions(-) (limited to 'test') diff --git a/test/testutils/domtsasserts.c b/test/testutils/domtsasserts.c index 488f294..03d0907 100644 --- a/test/testutils/domtsasserts.c +++ b/test/testutils/domtsasserts.c @@ -217,35 +217,24 @@ bool is_contenttype(const char *type) return false; } -bool has_feature(char *feature, char *version) +bool has_feature(const char *feature, const char *version) { dom_exception err; bool ret; - dom_string *df, *dv; - err = dom_string_create(myrealloc, NULL, (const uint8_t *)feature, - feature == NULL ? 0 : strlen(feature), &df); - if (err != DOM_NO_ERR) - return false; - - err = dom_string_create(myrealloc, NULL, (const uint8_t *)version, - version == NULL ? 0 : strlen(version), &dv); - if (err != DOM_NO_ERR) { - dom_string_unref(df); - return false; - } + if (feature == NULL) + feature = ""; + + if (version == NULL) + version = ""; - err = dom_implementation_has_feature(df, dv, &ret); + err = dom_implementation_has_feature(feature, version, &ret); /* Here, when we come with exception, we should return false, * TODO: this need to be improved, but I can't figure out how */ if (err != DOM_NO_ERR) { - dom_string_unref(df); - dom_string_unref(dv); return false; } - dom_string_unref(df); - dom_string_unref(dv); return ret; } diff --git a/test/testutils/domtsasserts.h b/test/testutils/domtsasserts.h index bb39fe5..c301d88 100644 --- a/test/testutils/domtsasserts.h +++ b/test/testutils/domtsasserts.h @@ -55,7 +55,7 @@ bool is_uri_equals(char *scheme, char *path, char *host, bool is_contenttype(const char *type); -bool has_feature(char *feature, char *version); +bool has_feature(const char *feature, const char *version); bool implementation_attribute(char *name, bool value); -- cgit v1.2.3