[or-cvs] [tor/master 6/7] Remove some redundant code in options_save_current()
nickm at torproject.org
nickm at torproject.org
Mon Feb 22 17:47:26 UTC 2010
Author: Sebastian Hahn <sebastian at torproject.org>
Date: Mon, 22 Feb 2010 12:21:58 +0100
Subject: Remove some redundant code in options_save_current()
Commit: 1dfbec482c50dabd2359d74848a13cbc03c4f9ea
get_torrc_fname() does the same thing we did in this code, so let's
replace it.
---
src/or/config.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/or/config.c b/src/or/config.c
index b881387..0453904 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4628,15 +4628,12 @@ write_configuration_file(const char *fname, or_options_t *options)
int
options_save_current(void)
{
- if (torrc_fname) {
- /* This fails if we can't write to our configuration file.
- *
- * If we try falling back to datadirectory or something, we have a better
- * chance of saving the configuration, but a better chance of doing
- * something the user never expected. Let's just warn instead. */
- return write_configuration_file(torrc_fname, get_options());
- }
- return write_configuration_file(get_default_conf_file(), get_options());
+ /* This fails if we can't write to our configuration file.
+ *
+ * If we try falling back to datadirectory or something, we have a better
+ * chance of saving the configuration, but a better chance of doing
+ * something the user never expected. */
+ return write_configuration_file(get_torrc_fname(), get_options());
}
/** Mapping from a unit name to a multiplier for converting that unit into a
--
1.6.5
More information about the tor-commits
mailing list