[tor-commits] [tor/master] Use get_datadir_fname() accessor in networkstatus.c

nickm at torproject.org nickm at torproject.org
Wed Dec 6 00:53:09 UTC 2017


commit 2e872f6b32edaace096180c249934c620cd3ce35
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 14 16:10:12 2017 -0500

    Use get_datadir_fname() accessor in networkstatus.c
---
 src/or/networkstatus.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index a7aa01f78..ff3247668 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2260,7 +2260,6 @@ void
 networkstatus_dump_bridge_status_to_file(time_t now)
 {
   char *status = networkstatus_getinfo_by_purpose("bridge", now);
-  const or_options_t *options = get_options();
   char *fname = NULL;
   char *thresholds = NULL;
   char *published_thresholds_and_status = NULL;
@@ -2282,8 +2281,7 @@ networkstatus_dump_bridge_status_to_file(time_t now)
                "published %s\nflag-thresholds %s\n%s%s",
                published, thresholds, fingerprint_line ? fingerprint_line : "",
                status);
-  tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges",
-               options->DataDirectory);
+  fname = get_datadir_fname("networkstatus-bridges");
   write_str_to_file(fname,published_thresholds_and_status,0);
   tor_free(thresholds);
   tor_free(published_thresholds_and_status);





More information about the tor-commits mailing list