[tor-commits] [tor/master] Fix another duplicate typedef.

asn at torproject.org asn at torproject.org
Mon Nov 2 15:34:40 UTC 2020


commit 7a75a1064fe41847b6c42c1d995a27f08987aa93
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 2 07:15:10 2020 -0500

    Fix another duplicate typedef.
    
    Fixes #40177; bugfix on 0.4.5.1-alpha.
---
 changes/bug40177                | 3 +++
 src/lib/metrics/metrics_store.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/bug40177 b/changes/bug40177
new file mode 100644
index 0000000000..b08be64e47
--- /dev/null
+++ b/changes/bug40177
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Remove a duplicate typedef in metrics_store.c.  Fixes bug 40177;
+      bugfix on 0.4.5.1-alpha.
diff --git a/src/lib/metrics/metrics_store.c b/src/lib/metrics/metrics_store.c
index 4f048e103d..abc093a564 100644
--- a/src/lib/metrics/metrics_store.c
+++ b/src/lib/metrics/metrics_store.c
@@ -22,7 +22,7 @@
 #include "lib/metrics/prometheus.h"
 
 /** A metric store which contains a map of entries. */
-typedef struct metrics_store_t {
+struct metrics_store_t {
   /** Indexed by metrics entry name. An entry is a smartlist_t of one or more
    * metrics_store_entry_t allowing for multiple metrics of the same name.
    *
@@ -31,7 +31,7 @@ typedef struct metrics_store_t {
    * One example is an onion service with multiple ports, the port specific
    * metrics will have a port value as a label. */
   strmap_t *entries;
-} metrics_store_t;
+};
 
 /** Function pointer to the format function of a specific driver. */
 typedef void (fmt_driver_fn_t)(const metrics_store_entry_t *, buf_t *);



More information about the tor-commits mailing list