aboutsummaryrefslogtreecommitdiff
path: root/src/common/container.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-21 15:33:25 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-21 15:33:25 -0400
commitf95e3bf5fc4e2d5fef42b86d81f155c00b1983ac (patch)
tree75412c13599cfefbd1edb2b38dc3005db8ee7ad0 /src/common/container.h
parente066966bf48b4f6ca557175cb2ab3e2dffa5b1db (diff)
downloadtor-f95e3bf5fc4e2d5fef42b86d81f155c00b1983ac.tar.gz
tor-f95e3bf5fc4e2d5fef42b86d81f155c00b1983ac.zip
Simplify include structure of container.[ch]
Diffstat (limited to 'src/common/container.h')
-rw-r--r--src/common/container.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/common/container.h b/src/common/container.h
index 372fa6640c..c45bfc359b 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -6,7 +6,15 @@
#ifndef TOR_CONTAINER_H
#define TOR_CONTAINER_H
-#include "common/util.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lib/cc/compat_compiler.h"
+#include "lib/cc/torint.h"
+#include "lib/testsupport/testsupport.h"
+#include "lib/malloc/util_malloc.h"
+#include "common/util_bug.h"
#include "siphash.h"
/** A resizeable list of pointers, with associated helpful functionality.
@@ -34,6 +42,7 @@ MOCK_DECL(void, smartlist_free_, (smartlist_t *sl));
void smartlist_clear(smartlist_t *sl);
void smartlist_add(smartlist_t *sl, void *element);
void smartlist_add_all(smartlist_t *sl, const smartlist_t *s2);
+void smartlist_add_strdup(struct smartlist_t *sl, const char *string);
void smartlist_remove(smartlist_t *sl, const void *element);
void smartlist_remove_keeporder(smartlist_t *sl, const void *element);
void *smartlist_pop_last(smartlist_t *sl);
@@ -739,4 +748,3 @@ third_quartile_uint32(uint32_t *array, int n_elements)
}
#endif /* !defined(TOR_CONTAINER_H) */
-