commit 94feec59cf2f4c28578ba9c75c7ece781ed6f19b Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 12 19:11:52 2019 -0400

move pubsub_connector_t typedef to pubsub_connect.h --- src/lib/pubsub/pubsub_build.h | 17 +++++------------ src/lib/pubsub/pubsub_connect.h | 8 +++++++- 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/lib/pubsub/pubsub_build.h b/src/lib/pubsub/pubsub_build.h index 3fad25453..93aad50b2 100644 --- a/src/lib/pubsub/pubsub_build.h +++ b/src/lib/pubsub/pubsub_build.h @@ -17,6 +17,7 @@ #include "lib/dispatch/msgtypes.h"

struct dispatch_t; +struct pubsub_connector_t;

/** * A "dispatch builder" is an incomplete dispatcher, used when @@ -27,14 +28,6 @@ struct dispatch_t; typedef struct pubsub_builder_t pubsub_builder_t;

/** - * A "dispatch connector" is a view of the dispatcher that a subsystem - * uses while initializing itself. It is specific to the subsystem, and - * ensures that each subsystem doesn't need to identify itself - * repeatedly while registering its messages. - **/ -typedef struct pubsub_connector_t pubsub_connector_t; - -/** * A "pubsub items" holds the configuration items used to configure a * pubsub_builder. After the builder is finalized, this field is extracted, * and used later to tear down pointers that enable publishing. @@ -65,16 +58,16 @@ void pubsub_builder_free_(pubsub_builder_t *); * register its messages. The main-init code does this during susbsystem * initialization. */ -pubsub_connector_t *pubsub_connector_for_subsystem(pubsub_builder_t *, - subsys_id_t); +struct pubsub_connector_t *pubsub_connector_for_subsystem(pubsub_builder_t *, + subsys_id_t);

/** * The main-init code does this after subsystem initialization. */ #define pubsub_connector_free(c) \ - FREE_AND_NULL(pubsub_connector_t, pubsub_connector_free_, (c)) + FREE_AND_NULL(struct pubsub_connector_t, pubsub_connector_free_, (c))

-void pubsub_connector_free_(pubsub_connector_t *); +void pubsub_connector_free_(struct pubsub_connector_t *);

/** * Constructs a dispatcher from a dispatch_builder, after checking that the diff --git a/src/lib/pubsub/pubsub_connect.h b/src/lib/pubsub/pubsub_connect.h index f3de74c87..e4d860005 100644 --- a/src/lib/pubsub/pubsub_connect.h +++ b/src/lib/pubsub/pubsub_connect.h @@ -19,7 +19,13 @@ #include "lib/dispatch/msgtypes.h"

struct pub_binding_t; -struct pubsub_connector_t; +/** + * A "dispatch connector" is a view of the dispatcher that a subsystem + * uses while initializing itself. It is specific to the subsystem, and + * ensures that each subsystem doesn't need to identify itself + * repeatedly while registering its messages. + **/ +typedef struct pubsub_connector_t pubsub_connector_t;

int pubsub_add_pub_(struct pubsub_connector_t *con, struct pub_binding_t *out,