commit 6aeabd454e67a370d9b5793a488bdf6d83c61ec7 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 14 15:56:25 2017 -0500

Reindent the body of get_data_directory()

I don't know why it wasn't indented properly, but we may as well fix it now. --- src/or/config.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c index ad5c3143f..0cbf2954f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7700,25 +7700,25 @@ get_data_directory(const char *val) d = "~/.tor";

if (!strcmpstart(d, "~/")) { - char *fn = expand_filename(d); - if (!fn) { - log_warn(LD_CONFIG,"Failed to expand filename "%s".", d); - return NULL; - } - if (!val && !strcmp(fn,"/.tor")) { - /* If our homedir is /, we probably don't want to use it. */ - /* Default to LOCALSTATEDIR/tor which is probably closer to what we - * want. */ - log_warn(LD_CONFIG, - "Default DataDirectory is "~/.tor". This expands to " - ""%s", which is probably not what you want. Using " - ""%s"PATH_SEPARATOR"tor" instead", fn, LOCALSTATEDIR); - tor_free(fn); - fn = tor_strdup(LOCALSTATEDIR PATH_SEPARATOR "tor"); - } - return fn; - } - return tor_strdup(d); + char *fn = expand_filename(d); + if (!fn) { + log_warn(LD_CONFIG,"Failed to expand filename "%s".", d); + return NULL; + } + if (!val && !strcmp(fn,"/.tor")) { + /* If our homedir is /, we probably don't want to use it. */ + /* Default to LOCALSTATEDIR/tor which is probably closer to what we + * want. */ + log_warn(LD_CONFIG, + "Default DataDirectory is "~/.tor". This expands to " + ""%s", which is probably not what you want. Using " + ""%s"PATH_SEPARATOR"tor" instead", fn, LOCALSTATEDIR); + tor_free(fn); + fn = tor_strdup(LOCALSTATEDIR PATH_SEPARATOR "tor"); + } + return fn; + } + return tor_strdup(d); #endif /* defined(_WIN32) */ }