From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 14 Nov 2017 21:10:12 +0000 (-0500)
Subject: Use get_datadir_fname() accessor in networkstatus.c
X-Git-Tag: tor-0.3.3.1-alpha~160^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e872f6b32edaace096180c249934c620cd3ce35;p=thirdparty%2Ftor.git

Use get_datadir_fname() accessor in networkstatus.c
---

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index a7aa01f787..ff32476685 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);