diff options
| -rw-r--r-- | render/textplain.c | 5 | ||||
| -rw-r--r-- | utils/utils.c | 14 | ||||
| -rw-r--r-- | utils/utils.h | 11 |
3 files changed, 2 insertions, 28 deletions
diff --git a/render/textplain.c b/render/textplain.c index 10cf16a71..892e03e57 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -283,12 +283,11 @@ nserror textplain_create_internal(textplain_content *c, lwc_string *encoding) goto no_memory; error = parserutils_inputstream_create(lwc_string_data(encoding), 0, - textplain_charset_hack, ns_realloc, NULL, &stream); + textplain_charset_hack, &stream); if (error == PARSERUTILS_BADENCODING) { /* Fall back to Windows-1252 */ error = parserutils_inputstream_create("Windows-1252", 0, - textplain_charset_hack, ns_realloc, NULL, - &stream); + textplain_charset_hack, &stream); } if (error != PARSERUTILS_OK) { free(utf8_data); 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); |