diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-07 10:44:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:47:19 -0500 |
| commit | 285632a61b4e4aeec07b26004396473e0d8f4a43 (patch) | |
| tree | ec6b0363f3072ba5e5c13ac1fb7cb2fb3c44db50 /src/or/hs_service.h | |
| parent | 95531ddfbfb6cb30760523d91fd4dfc966d2f6a5 (diff) | |
| download | tor-285632a61b4e4aeec07b26004396473e0d8f4a43.tar.gz tor-285632a61b4e4aeec07b26004396473e0d8f4a43.zip | |
Replace all FREE_AND_NULL* uses to take a type and a free function.
This commit was made mechanically by this perl script:
\#!/usr/bin/perl -w -i -p
next if /^#define FREE_AND_NULL/;
s/\bFREE_AND_NULL\((\w+),/FREE_AND_NULL\(${1}_t, ${1}_free_,/;
s/\bFREE_AND_NULL_UNMATCHED\(/FREE_AND_NULL\(/;
Diffstat (limited to 'src/or/hs_service.h')
| -rw-r--r-- | src/or/hs_service.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/hs_service.h b/src/or/hs_service.h index f933ba6ab1..bc6987dee5 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -250,7 +250,7 @@ void hs_service_free_all(void); /* Service new/free functions. */ hs_service_t *hs_service_new(const or_options_t *options); void hs_service_free_(hs_service_t *service); -#define hs_service_free(s) FREE_AND_NULL(hs_service, (s)) +#define hs_service_free(s) FREE_AND_NULL(hs_service_t, hs_service_free_, (s)) unsigned int hs_service_get_num_services(void); void hs_service_stage_services(const smartlist_t *service_list); @@ -296,7 +296,7 @@ STATIC hs_service_intro_point_t *service_intro_point_new( unsigned int is_legacy); STATIC void service_intro_point_free_(hs_service_intro_point_t *ip); #define service_intro_point_free(ip) \ - FREE_AND_NULL_UNMATCHED(hs_service_intro_point_t, \ + FREE_AND_NULL(hs_service_intro_point_t, \ service_intro_point_free_, (ip)) STATIC void service_intro_point_add(digest256map_t *map, hs_service_intro_point_t *ip); @@ -332,7 +332,7 @@ encode_desc_rev_counter_for_state(const hs_service_descriptor_t *desc); STATIC void service_descriptor_free_(hs_service_descriptor_t *desc); #define service_descriptor_free(d) \ - FREE_AND_NULL_UNMATCHED(hs_service_descriptor_t, \ + FREE_AND_NULL(hs_service_descriptor_t, \ service_descriptor_free_, (d)) STATIC uint64_t |