tor

commit 50abc06d84cabdc2a9471d888f2e32d5c27c9815
parent 62e1d983cf362d6769e763e8b50ab8a51bdc84d4
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 25 Jun 2020 10:02:17 -0400

Remove now-unused OPTIONS_DUMP_DEFAULTS.

Diffstat:
M
src/app/config/config.c
 | 
4
----
M
src/app/config/config.h
 | 
3
+--

2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -2771,10 +2771,6 @@ options_dump(const or_options_t *options, int how_to_dump)
       use_defaults = global_default_options;
       minimal = 1;
       break;
-    case OPTIONS_DUMP_DEFAULTS:
-      use_defaults = NULL;
-      minimal = 1;
-      break;
     case OPTIONS_DUMP_ALL:
       use_defaults = NULL;
       minimal = 0;
diff --git a/src/app/config/config.h b/src/app/config/config.h
@@ -58,8 +58,7 @@ setopt_err_t options_trial_assign(struct config_line_t *list, unsigned flags,
 void options_init(or_options_t *options);
 
 #define OPTIONS_DUMP_MINIMAL 1
-#define OPTIONS_DUMP_DEFAULTS 2
-#define OPTIONS_DUMP_ALL 3
+#define OPTIONS_DUMP_ALL 2
 char *options_dump(const or_options_t *options, int how_to_dump);
 int options_init_from_torrc(int argc, char **argv);
 setopt_err_t options_init_from_string(const char *cf_defaults, const char *cf,