[tor-commits] [tor/master] consdiffmgr.h: use struct declarations for several types

nickm at torproject.org nickm at torproject.org
Thu Jan 9 12:32:53 UTC 2020


commit afa36682f959d12da1d6369b38d5d960f345c09a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 16 13:16:35 2019 -0500

    consdiffmgr.h: use struct declarations for several types
    
    This prevents a dependency on include order.
---
 src/feature/dircache/consdiffmgr.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/feature/dircache/consdiffmgr.h b/src/feature/dircache/consdiffmgr.h
index f72dd5b28..07ae6fac6 100644
--- a/src/feature/dircache/consdiffmgr.h
+++ b/src/feature/dircache/consdiffmgr.h
@@ -66,17 +66,19 @@ void consdiffmgr_free_all(void);
 int consdiffmgr_validate(void);
 
 #ifdef CONSDIFFMGR_PRIVATE
+struct consensus_cache_t;
+struct consensus_cache_entry_t;
 STATIC unsigned n_diff_compression_methods(void);
 STATIC unsigned n_consensus_compression_methods(void);
-STATIC consensus_cache_t *cdm_cache_get(void);
-STATIC consensus_cache_entry_t *cdm_cache_lookup_consensus(
+STATIC struct consensus_cache_t *cdm_cache_get(void);
+STATIC struct consensus_cache_entry_t *cdm_cache_lookup_consensus(
                           consensus_flavor_t flavor, time_t valid_after);
 STATIC int cdm_entry_get_sha3_value(uint8_t *digest_out,
-                                    consensus_cache_entry_t *ent,
+                                    struct consensus_cache_entry_t *ent,
                                     const char *label);
 STATIC int uncompress_or_set_ptr(const char **out, size_t *outlen,
                                  char **owned_out,
-                                 consensus_cache_entry_t *ent);
+                                 struct consensus_cache_entry_t *ent);
 #endif /* defined(CONSDIFFMGR_PRIVATE) */
 
 #ifdef TOR_UNIT_TESTS





More information about the tor-commits mailing list