aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-07-30 10:51:55 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-18 08:56:23 -0400
commit60c8fbf1ffad7c13556edc3582d2c27243865d54 (patch)
tree7df5382aeccade86998d880f1c308dc60beba55a /src/or/control.h
parentbab221f1131e3c0552b3564ea72800d1d4a8facf (diff)
downloadtor-60c8fbf1ffad7c13556edc3582d2c27243865d54.tar.gz
tor-60c8fbf1ffad7c13556edc3582d2c27243865d54.zip
Remove obsolete event_format_t
We used to use this when we had some controllers that would accept long names and some that wouldn't. But it's been obsolete for a while, and it's time to strip it out of the code.
Diffstat (limited to 'src/or/control.h')
-rw-r--r--src/or/control.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/or/control.h b/src/or/control.h
index 084030562a..8aa4780b68 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -211,18 +211,11 @@ void control_free_all(void);
/* Used only by control.c and test.c */
STATIC size_t write_escaped_data(const char *data, size_t len, char **out);
STATIC size_t read_escaped_data(const char *data, size_t len, char **out);
-/** Flag for event_format_t. Indicates that we should use the one standard
- format. (Other formats previous existed, and are now deprecated)
- */
-#define ALL_FORMATS 1
-/** Bit field of flags to select how to format a controller event. Recognized
- * flag is ALL_FORMATS. */
-typedef int event_format_t;
#ifdef TOR_UNIT_TESTS
MOCK_DECL(STATIC void,
-send_control_event_string,(uint16_t event, event_format_t which,
- const char *msg));
+ send_control_event_string,(uint16_t event, const char *msg));
+
MOCK_DECL(STATIC void,
queue_control_event_string,(uint16_t event, char *msg));