[tor-commits] [tor/master] Remove now-unused OPTIONS_DUMP_DEFAULTS.

[dgoulet at torproject.org]

commit 50abc06d84cabdc2a9471d888f2e32d5c27c9815
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 25 10:02:17 2020 -0400

    Remove now-unused OPTIONS_DUMP_DEFAULTS.
---
 src/app/config/config.c | 4 ----
 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
index 286cd9304..0048c96f4 100644
--- 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
index 17caa0e3f..f7d4e49f6 100644
--- 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,