From 0e911abf27c7a7ede6dea81167c6e8b12b53174c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 11 Jan 2012 10:19:24 -0500 Subject: Rename CIRC2 to CIRC_MINOR Also give the arguments to control_event_circuit_status_minor real names. --- src/or/or.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/or/or.h') diff --git a/src/or/or.h b/src/or/or.h index 0ba52af9d5..e103a695c9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3751,12 +3751,12 @@ typedef enum circuit_status_event_t { CIRC_EVENT_CLOSED = 4, } circuit_status_event_t; -/** Used to indicate the type of a CIRC2 event passed to the controller. +/** Used to indicate the type of a CIRC_MINOR event passed to the controller. * The various types are defined in control-spec.txt . */ -typedef enum circuit_status_2_event_t { - CIRC2_EVENT_PURPOSE_CHANGED = 0, - CIRC2_EVENT_CANNIBALIZED = 1, -} circuit_status_2_event_t; +typedef enum circuit_status_minor_event_t { + CIRC_MINOR_EVENT_PURPOSE_CHANGED, + CIRC_MINOR_EVENT_CANNIBALIZED, +} circuit_status_minor_event_t; /** Used to indicate the type of a stream event passed to the controller. * The various types are defined in control-spec.txt */ -- cgit v1.2.3-54-g00ecf