aboutsummaryrefslogtreecommitdiff
path: root/src/feature/dirauth/dirauth_config.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-11-14 10:52:21 -0500
committerNick Mathewson <nickm@torproject.org>2019-11-14 15:43:53 -0500
commitd57a04b6481a0cccd475c31ed5547767c4b9df89 (patch)
treed3fac7f43302ef75ca3d9bd2b2a034ce20390ea6 /src/feature/dirauth/dirauth_config.h
parenta76b7cd8b5da9951e5e446846ef4e3d9ec6b1453 (diff)
downloadtor-d57a04b6481a0cccd475c31ed5547767c4b9df89.tar.gz
tor-d57a04b6481a0cccd475c31ed5547767c4b9df89.zip
Avoid redundant typedef of or_options_t and smartlist_t in *_config.h
Fixes bug 32495.
Diffstat (limited to 'src/feature/dirauth/dirauth_config.h')
-rw-r--r--src/feature/dirauth/dirauth_config.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h
index 655ab0a7fa..b494ca685e 100644
--- a/src/feature/dirauth/dirauth_config.h
+++ b/src/feature/dirauth/dirauth_config.h
@@ -12,31 +12,31 @@
#ifndef TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H
#define TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H
-typedef struct or_options_t or_options_t;
+struct or_options_t;
#ifdef HAVE_MODULE_DIRAUTH
#include "lib/cc/torint.h"
-int options_validate_dirauth_mode(const or_options_t *old_options,
- or_options_t *options,
+int options_validate_dirauth_mode(const struct or_options_t *old_options,
+ struct or_options_t *options,
char **msg);
-int options_validate_dirauth_bandwidth(const or_options_t *old_options,
- or_options_t *options,
+int options_validate_dirauth_bandwidth(const struct or_options_t *old_options,
+ struct or_options_t *options,
char **msg);
-int options_validate_dirauth_schedule(const or_options_t *old_options,
- or_options_t *options,
+int options_validate_dirauth_schedule(const struct or_options_t *old_options,
+ struct or_options_t *options,
char **msg);
-int options_validate_dirauth_testing(const or_options_t *old_options,
- or_options_t *options,
+int options_validate_dirauth_testing(const struct or_options_t *old_options,
+ struct or_options_t *options,
char **msg);
-int options_act_dirauth(const or_options_t *old_options);
-int options_act_dirauth_mtbf(const or_options_t *old_options);
-int options_act_dirauth_stats(const or_options_t *old_options,
+int options_act_dirauth(const struct or_options_t *old_options);
+int options_act_dirauth_mtbf(const struct or_options_t *old_options);
+int options_act_dirauth_stats(const struct or_options_t *old_options,
bool *print_notice_out);
#else /* !defined(HAVE_MODULE_DIRAUTH) */
@@ -47,8 +47,8 @@ int options_act_dirauth_stats(const or_options_t *old_options,
* Returns -1 and sets msg to a newly allocated string, if AuthoritativeDir
* is set in options. Otherwise returns 0. */
static inline int
-options_validate_dirauth_mode(const or_options_t *old_options,
- or_options_t *options,
+options_validate_dirauth_mode(const struct or_options_t *old_options,
+ struct or_options_t *options,
char **msg)
{
(void)old_options;