diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-21 09:37:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:47:19 -0500 |
| commit | 176ad729d9b1ddeccdb3e721b5ab1bf64646223f (patch) | |
| tree | be4ff3e62b459859c7c87bf663a37e3806eac8f9 /src/or/entrynodes.h | |
| parent | 0792cc107ef588b9f9fa27165b73e19fbf07e92b (diff) | |
| download | tor-176ad729d9b1ddeccdb3e721b5ab1bf64646223f.tar.gz tor-176ad729d9b1ddeccdb3e721b5ab1bf64646223f.zip | |
Change the free macro convention in the rest of src/or/*.h
Diffstat (limited to 'src/or/entrynodes.h')
| -rw-r--r-- | src/or/entrynodes.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index d7f4967a0c..5fd4c970db 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -486,7 +486,8 @@ STATIC guard_selection_t *guard_selection_new(const char *name, guard_selection_type_t type); STATIC guard_selection_t *get_guard_selection_by_name( const char *name, guard_selection_type_t type, int create_if_absent); -STATIC void guard_selection_free(guard_selection_t *gs); +STATIC void guard_selection_free_(guard_selection_t *gs); +#define guard_selection_free(gs) FREE_AND_NULL(guard_selection, (gs)) MOCK_DECL(STATIC int, entry_guard_is_listed, (guard_selection_t *gs, const entry_guard_t *guard)); STATIC const char *choose_guard_selection(const or_options_t *options, @@ -570,7 +571,9 @@ STATIC entry_guard_restriction_t *guard_create_exit_restriction( STATIC entry_guard_restriction_t *guard_create_dirserver_md_restriction(void); -STATIC void entry_guard_restriction_free(entry_guard_restriction_t *rst); +STATIC void entry_guard_restriction_free_(entry_guard_restriction_t *rst); +#define entry_guard_restriction_free(rst) \ + FREE_AND_NULL(entry_guard_restriction, (rst)) #endif /* defined(ENTRYNODES_PRIVATE) */ |