diff options
author | Nick Mathewson <nickm@torproject.org> | 2004-08-18 03:47:55 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2004-08-18 03:47:55 +0000 |
commit | 8626c7724e1616a6677e30c9c3c8a06bb96da9b0 (patch) | |
tree | 68dcfa0ef33a50ebcc547dc9da34e7233fe01acd | |
parent | 17ce7d499fbbcfb815704a6b90644aa8172a1771 (diff) | |
download | tor-8626c7724e1616a6677e30c9c3c8a06bb96da9b0.tar.gz tor-8626c7724e1616a6677e30c9c3c8a06bb96da9b0.zip |
Clean windows whitespace
svn:r2266
-rw-r--r-- | src/or/config.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/or/config.c b/src/or/config.c index 8f670cb8ae..45f9407366 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -588,7 +588,7 @@ static char *get_default_conf_file(void) char *path = tor_malloc(MAX_PATH); if (!SUCCEEDED(SHGetSpecialFolderPath(NULL, path, CSIDL_APPDATA, 1))) { tor_free(path); - return NULL; + return NULL; } strlcat(path,"\\tor\\torrc",MAX_PATH); return path; @@ -651,21 +651,21 @@ int getconfig(int argc, char **argv, or_options_t *options) { using_default_torrc = 0; } else { /* didn't find one, try CONFDIR */ - char *fn; - using_default_torrc = 1; - fn = get_default_conf_file(); + char *fn; + using_default_torrc = 1; + fn = get_default_conf_file(); if (fn && file_status(fn)==FN_FILE) { - fname = fn; - } else { - tor_free(fn); - fn = expand_filename("~/.torrc"); - if (fn && file_status(fn)==FN_FILE) { - fname = fn; - } else { - tor_free(fn); - fname = get_default_conf_file(); - } - } + fname = fn; + } else { + tor_free(fn); + fn = expand_filename("~/.torrc"); + if (fn && file_status(fn)==FN_FILE) { + fname = fn; + } else { + tor_free(fn); + fname = get_default_conf_file(); + } + } } log(LOG_DEBUG,"Opening config file '%s'",fname); @@ -1040,13 +1040,13 @@ const char *get_data_directory(or_options_t *options) { else if (server_mode()) { #ifdef MS_WINDOWS char *p; - p = tor_malloc(MAX_PATH); + p = tor_malloc(MAX_PATH); if (!SUCCEEDED(SHGetSpecialFolderPath(NULL, p, CSIDL_APPDATA, 1))) { strlcpy(p,CONFDIR, MAX_PATH); - } + } strlcat(p,"\\tor",MAX_PATH); options->DataDirectory = p; - return p; + return p; #else d = "~/.tor"; #endif |