]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Clean up a needlessly complex get_datadir_fname use
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Nov 2017 21:54:20 +0000 (16:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 6 Dec 2017 00:49:28 +0000 (19:49 -0500)
src/or/main.c

index c0bdbd760322a042b0641d1025266bde1db22518..2234e7cdb817fc2b3d5ec046be2591e85a34b323 100644 (file)
@@ -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);