commit 39a780e85a0a8cb42f817d0d948ce8fb97662bd3 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 14 16:54:20 2017 -0500

Clean up a needlessly complex get_datadir_fname use --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/main.c b/src/or/main.c index c0bdbd760..2234e7cdb 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);