From 330edc2c93df8d69eac8b486ce7e784769bda772 Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 16 Aug 2016 13:11:45 -0400 Subject: [PATCH] [utils] cstring_array_get_phrase requires a char_array to be passed in so it doesn't have to do any memory allocation --- src/trie_search.c | 8 +------- src/trie_search.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/trie_search.c b/src/trie_search.c index dc110d02..6286e718 100644 --- a/src/trie_search.c +++ b/src/trie_search.c @@ -774,7 +774,7 @@ inline phrase_t trie_search_prefixes(trie_t *self, char *word, size_t len) { } -inline char *cstring_array_get_phrase_with_char_array(cstring_array *str, char_array *phrase_tokens, phrase_t phrase) { +inline char *cstring_array_get_phrase(cstring_array *str, char_array *phrase_tokens, phrase_t phrase) { char_array_clear(phrase_tokens); size_t phrase_end = phrase.start + phrase.len; @@ -791,9 +791,3 @@ inline char *cstring_array_get_phrase_with_char_array(cstring_array *str, char_a return char_array_get_string(phrase_tokens); } - -inline char *cstring_array_get_phrase(tokenized_string_t *str, char_array *phrase_tokens, phrase_t phrase) { - return cstring_array_get_phrase_with_char_array(str->strings, phrase_tokens, phrase); -} - - diff --git a/src/trie_search.h b/src/trie_search.h index b2934dee..a553cf70 100644 --- a/src/trie_search.h +++ b/src/trie_search.h @@ -40,7 +40,6 @@ phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, size_t len, u phrase_t trie_search_prefixes_from_index_get_prefix_char(trie_t *self, char *word, size_t len, uint32_t start_node_id); phrase_t trie_search_prefixes(trie_t *self, char *word, size_t len); -char *cstring_array_get_phrase_with_char_array(cstring_array *str, char_array *phrase_tokens, phrase_t phrase); char *cstring_array_get_phrase(tokenized_string_t *str, char_array *phrase_tokens, phrase_t phrase); #endif