From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 14 Nov 2017 21:54:20 +0000 (-0500)
Subject: Clean up a needlessly complex get_datadir_fname use
X-Git-Tag: tor-0.3.3.1-alpha~160^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39a780e85a0a8cb42f817d0d948ce8fb97662bd3;p=thirdparty%2Ftor.git

Clean up a needlessly complex get_datadir_fname use
---

diff --git a/src/or/main.c b/src/or/main.c
index c0bdbd7603..2234e7cdb8 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3274,7 +3274,7 @@ try_locking(const or_options_t *options, int err_if_locked)
   if (lockfile)
     return 0;
   else {
-    char *fname = options_get_datadir_fname2_suffix(options, "lock",NULL,NULL);
+    char *fname = options_get_datadir_fname(options, "lock");
     int already_locked = 0;
     tor_lockfile_t *lf = tor_lockfile_lock(fname, 0, &already_locked);
     tor_free(fname);