Remove unused arguments from options_validate().

This change breaks compilation; a subsequent commit will fix it with
a coccinelle patch.

diff --git a/src/app/config/config.c b/src/app/config/config.c
index be243a0d8cbcd89eeb208ca265907e84276e277a..40340af79dae3c165fb17804a3c3ba1837d92844 100644 (file)
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3431,15 +3431,12 @@ options_validate_single_onion(or_options_t *options, char **msg)
  */
 STATIC int
 options_validate(or_options_t *old_options, or_options_t *options,
-                 or_options_t *default_options_unused, int from_setconf_unused,
                  char **msg)
 {
   config_line_t *cl;
   const char *uname = get_uname();
   int n_ports=0;
   int world_writable_control_socket=0;
-  (void)from_setconf_unused; /* 29211 TODO: Remove this from the API. */
-  (void)default_options_unused; /* 29211 TODO: Remove this from the API. */
 
   tor_assert(msg);
   *msg = NULL;

diff --git a/src/app/config/config.h b/src/app/config/config.h
index 0c61fc7c0f5332be33e7e5fe5cda0f17d18f5435..32ddc67652d173cb3f6042be1b56f2a1649d3a1b 100644 (file)
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -279,8 +279,7 @@ STATIC int options_validate_single_onion(or_options_t *options,
                                          char **msg);
 STATIC int options_validate(or_options_t *old_options,
                             or_options_t *options,
-                            or_options_t *default_options,
-                            int from_setconf, char **msg);
+                            char **msg);
 STATIC int parse_transport_line(const or_options_t *options,
                                 const char *line, int validate_only,
                                 int server);