Cleanup: remove unused wordlist API functions

diff --git a/src/tests/stub_wordlist.cc b/src/tests/stub_wordlist.cc
index 63d6d2d08fa3042ad93e7c77854bb97452fd434c..947e3201552e8c4f5ccb5d85fab8d22e56a4ce9e 100644 (file)
--- a/src/tests/stub_wordlist.cc
+++ b/src/tests/stub_wordlist.cc
@@ -13,7 +13,5 @@
 #include "tests/STUB.h"
 
 const char *wordlistAdd(wordlist **, const char *) STUB_RETVAL(NULL)
-void wordlistAddWl(wordlist **, wordlist *) STUB
-void wordlistJoin(wordlist **, wordlist **) STUB
 void wordlistDestroy(wordlist **) STUB
 

diff --git a/src/wordlist.cc b/src/wordlist.cc
index c1982789d8b930a899000660a5a97009d4ab08a4..4b5abd47823f7a95b8e175e3eb04db0d8e620c8f 100644 (file)
--- a/src/wordlist.cc
+++ b/src/wordlist.cc
@@ -31,28 +31,6 @@ wordlistAdd(wordlist ** list, const char *key)
     return (*list)->key;
 }
 
-void
-wordlistJoin(wordlist ** list, wordlist ** wl)
-{
-    while (*list)
-        list = &(*list)->next;
-
-    *list = *wl;
-
-    *wl = NULL;
-}
-
-void
-wordlistAddWl(wordlist ** list, wordlist * wl)
-{
-    while (*list)
-        list = &(*list)->next;
-
-    for (; wl; wl = wl->next, list = &(*list)->next) {
-        *list = new wordlist(wl->key);
-    }
-}
-
 void
 wordlistCat(const wordlist * w, MemBuf * mb)
 {

diff --git a/src/wordlist.h b/src/wordlist.h
index 0712bd418ef077474b2f2f5c56ffcf8bb685a038..5a1a776851df00417a206af3906f4a160f2adef8 100644 (file)
--- a/src/wordlist.h
+++ b/src/wordlist.h
@@ -52,18 +52,6 @@ const char *wordlistAdd(wordlist **, const char *);
  */
 void wordlistCat(const wordlist *, MemBuf *);
 
-/** append a wordlist to another
- *
- * \deprecated use SBufList.merge(otherwordlist) instead
- */
-void wordlistAddWl(wordlist **, wordlist *);
-
-/** Concatenate the words in a wordlist
- *
- * \deprecated use SBufListContainerJoin(SBuf()) from sbuf/Algorithms.h instead
- */
-void wordlistJoin(wordlist **, wordlist **);
-
 /// destroy a wordlist
 void wordlistDestroy(wordlist **);