move pubsub_connector_t typedef to pubsub_connect.h

This commit is contained in:
Nick Mathewson 2019-03-12 19:11:52 -04:00
parent 22ad8658cd
commit 94feec59cf
2 changed files with 12 additions and 13 deletions

View File

@ -17,6 +17,7 @@
#include "lib/dispatch/msgtypes.h" #include "lib/dispatch/msgtypes.h"
struct dispatch_t; struct dispatch_t;
struct pubsub_connector_t;
/** /**
* A "dispatch builder" is an incomplete dispatcher, used when * A "dispatch builder" is an incomplete dispatcher, used when
@ -26,14 +27,6 @@ struct dispatch_t;
**/ **/
typedef struct pubsub_builder_t pubsub_builder_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 * A "pubsub items" holds the configuration items used to configure a
* pubsub_builder. After the builder is finalized, this field is extracted, * pubsub_builder. After the builder is finalized, this field is extracted,
@ -65,16 +58,16 @@ void pubsub_builder_free_(pubsub_builder_t *);
* register its messages. The main-init code does this during susbsystem * register its messages. The main-init code does this during susbsystem
* initialization. * initialization.
*/ */
pubsub_connector_t *pubsub_connector_for_subsystem(pubsub_builder_t *, struct pubsub_connector_t *pubsub_connector_for_subsystem(pubsub_builder_t *,
subsys_id_t); subsys_id_t);
/** /**
* The main-init code does this after subsystem initialization. * The main-init code does this after subsystem initialization.
*/ */
#define pubsub_connector_free(c) \ #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 * Constructs a dispatcher from a dispatch_builder, after checking that the

View File

@ -19,7 +19,13 @@
#include "lib/dispatch/msgtypes.h" #include "lib/dispatch/msgtypes.h"
struct pub_binding_t; 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, int pubsub_add_pub_(struct pubsub_connector_t *con,
struct pub_binding_t *out, struct pub_binding_t *out,