diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/corestrings.c | 5 | ||||
| -rw-r--r-- | utils/corestrings.h | 2 | ||||
| -rw-r--r-- | utils/utils.c | 14 | ||||
| -rw-r--r-- | utils/utils.h | 11 |
4 files changed, 4 insertions, 28 deletions
diff --git a/utils/corestrings.c b/utils/corestrings.c index 9e992b894..efdd0e07f 100644 --- a/utils/corestrings.c +++ b/utils/corestrings.c @@ -174,7 +174,6 @@ dom_string *corestring_dom_invalid; dom_string *corestring_dom_keydown; dom_string *corestring_dom_keypress; dom_string *corestring_dom_keyup; -dom_string *corestring_dom_key_css_bloom; dom_string *corestring_dom_link; dom_string *corestring_dom_load; dom_string *corestring_dom_loadeddata; @@ -233,6 +232,7 @@ dom_string *corestring_dom_volumechange; dom_string *corestring_dom_vspace; dom_string *corestring_dom_waiting; dom_string *corestring_dom_width; +dom_string *corestring_dom___ns_key_libcss_node_data; /* @@ -405,7 +405,6 @@ void corestrings_fini(void) CSS_DOM_STRING_UNREF(keydown); CSS_DOM_STRING_UNREF(keypress); CSS_DOM_STRING_UNREF(keyup); - CSS_DOM_STRING_UNREF(key_css_bloom); CSS_DOM_STRING_UNREF(link); CSS_DOM_STRING_UNREF(load); CSS_DOM_STRING_UNREF(loadeddata); @@ -464,6 +463,7 @@ void corestrings_fini(void) CSS_DOM_STRING_UNREF(vspace); CSS_DOM_STRING_UNREF(waiting); CSS_DOM_STRING_UNREF(width); + CSS_DOM_STRING_UNREF(__ns_key_libcss_node_data); #undef CSS_DOM_STRING_UNREF } @@ -724,6 +724,7 @@ nserror corestrings_init(void) CSS_DOM_STRING_INTERN(vspace); CSS_DOM_STRING_INTERN(waiting); CSS_DOM_STRING_INTERN(width); + CSS_DOM_STRING_INTERN(__ns_key_libcss_node_data); #undef CSS_DOM_STRING_INTERN exc = dom_string_create_interned((const uint8_t *) "text/javascript", diff --git a/utils/corestrings.h b/utils/corestrings.h index c37242a0e..c50cc3113 100644 --- a/utils/corestrings.h +++ b/utils/corestrings.h @@ -180,7 +180,6 @@ extern struct dom_string *corestring_dom_invalid; extern struct dom_string *corestring_dom_keydown; extern struct dom_string *corestring_dom_keypress; extern struct dom_string *corestring_dom_keyup; -extern struct dom_string *corestring_dom_key_css_bloom; extern struct dom_string *corestring_dom_link; extern struct dom_string *corestring_dom_load; extern struct dom_string *corestring_dom_loadeddata; @@ -239,6 +238,7 @@ extern struct dom_string *corestring_dom_volumechange; extern struct dom_string *corestring_dom_vspace; extern struct dom_string *corestring_dom_waiting; extern struct dom_string *corestring_dom_width; +extern struct dom_string *corestring_dom___ns_key_libcss_node_data; #endif diff --git a/utils/utils.c b/utils/utils.c index ac9f5af7a..8cb1987d4 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -37,20 +37,6 @@ #include "utils/utf8.h" #include "utils/utils.h" -void * -ns_realloc(void *ptr, size_t size, void *pw) -{ - (void)pw; - - if (ptr == NULL) - return size > 0 ? malloc(size) : NULL; - if (size == 0) { - free(ptr); - return NULL; - } - return realloc(ptr, size); -} - char * strip(char * const s) { size_t i; diff --git a/utils/utils.h b/utils/utils.h index a1ff683d3..f2241ae07 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -136,17 +136,6 @@ typedef struct #endif -/** - * Private-word-capable realloc() implementation which - * behaves as most NS libraries expect in the face of - * realloc(ptr, 0) and realloc(NULL, size). - * - * \param ptr The pointer for reallocation - * \param size The number of bytes for the allocation - * \param pw A "private word" which we ignore. - * \return The new pointer (NULL on frees or errors) - */ -void *ns_realloc(void *ptr, size_t size, void *pw); char * strip(char * const s); int whitespace(const char * str); |