From fcc9b0efe1accdb0edcb3143a8e15782e69383db Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 14 Aug 2005 02:33:41 +0000 Subject: * doxygen documentation updates * make AvahiPoll objects const * make poll() functions pluggable in AvahiSimplePoll git-svn-id: file:///home/lennart/svn/public/avahi/trunk@314 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/core.h | 2 +- avahi-core/netlink.c | 4 ++-- avahi-core/netlink.h | 2 +- avahi-core/server.c | 2 +- avahi-core/server.h | 2 +- avahi-core/timeeventq.c | 4 ++-- avahi-core/timeeventq.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'avahi-core') diff --git a/avahi-core/core.h b/avahi-core/core.h index 1f2dda9..b8ee91a 100644 --- a/avahi-core/core.h +++ b/avahi-core/core.h @@ -91,7 +91,7 @@ typedef struct AvahiServerConfig { /** Allocate a new mDNS responder object. */ AvahiServer *avahi_server_new( - AvahiPoll *api, /**< The main loop adapter */ + const AvahiPoll *api, /**< The main loop adapter */ const AvahiServerConfig *sc, /**< If non-NULL a pointer to a configuration structure for the server. The server makes an internal deep copy of this structure, so you may free it using avahi_server_config_done() immediately after calling this function. */ AvahiServerCallback callback, /**< A callback which is called whenever the state of the server changes */ void* userdata, /**< An opaque pointer which is passed to the callback function */ diff --git a/avahi-core/netlink.c b/avahi-core/netlink.c index 92d614f..c5afde9 100644 --- a/avahi-core/netlink.c +++ b/avahi-core/netlink.c @@ -41,7 +41,7 @@ struct AvahiNetlink { uint8_t* buffer; size_t buffer_length; - AvahiPoll *poll_api; + const AvahiPoll *poll_api; AvahiWatch *watch; }; @@ -93,7 +93,7 @@ static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent event, void *use avahi_netlink_work(nl, 0); } -AvahiNetlink *avahi_netlink_new(AvahiPoll *poll_api, uint32_t groups, void (*cb) (AvahiNetlink *nl, struct nlmsghdr *n, void* userdata), void* userdata) { +AvahiNetlink *avahi_netlink_new(const AvahiPoll *poll_api, uint32_t groups, void (*cb) (AvahiNetlink *nl, struct nlmsghdr *n, void* userdata), void* userdata) { int fd = -1; struct sockaddr_nl addr; AvahiNetlink *nl = NULL; diff --git a/avahi-core/netlink.h b/avahi-core/netlink.h index 4768b6e..78f92d8 100644 --- a/avahi-core/netlink.h +++ b/avahi-core/netlink.h @@ -32,7 +32,7 @@ typedef struct AvahiNetlink AvahiNetlink; typedef void (*AvahiNetlinkCallback)(AvahiNetlink *n, struct nlmsghdr *m, void* userdata); -AvahiNetlink *avahi_netlink_new(AvahiPoll *poll_api, uint32_t groups, AvahiNetlinkCallback callback, void* userdata); +AvahiNetlink *avahi_netlink_new(const AvahiPoll *poll_api, uint32_t groups, AvahiNetlinkCallback callback, void* userdata); void avahi_netlink_free(AvahiNetlink *n); int avahi_netlink_send(AvahiNetlink *n, struct nlmsghdr *m, unsigned *ret_seq); int avahi_netlink_work(AvahiNetlink *n, int block); diff --git a/avahi-core/server.c b/avahi-core/server.c index ca5da5d..40ef616 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -1301,7 +1301,7 @@ static int setup_sockets(AvahiServer *s) { return 0; } -AvahiServer *avahi_server_new(AvahiPoll *poll_api, const AvahiServerConfig *sc, AvahiServerCallback callback, void* userdata, int *error) { +AvahiServer *avahi_server_new(const AvahiPoll *poll_api, const AvahiServerConfig *sc, AvahiServerCallback callback, void* userdata, int *error) { AvahiServer *s; int e; diff --git a/avahi-core/server.h b/avahi-core/server.h index 3630d1e..6ceab42 100644 --- a/avahi-core/server.h +++ b/avahi-core/server.h @@ -90,7 +90,7 @@ struct AvahiSEntryGroup { }; struct AvahiServer { - AvahiPoll *poll_api; + const AvahiPoll *poll_api; AvahiInterfaceMonitor *monitor; AvahiServerConfig config; diff --git a/avahi-core/timeeventq.c b/avahi-core/timeeventq.c index b069ffd..bb9a5cd 100644 --- a/avahi-core/timeeventq.c +++ b/avahi-core/timeeventq.c @@ -42,7 +42,7 @@ struct AvahiTimeEvent { }; struct AvahiTimeEventQueue { - AvahiPoll *poll_api; + const AvahiPoll *poll_api; AvahiPrioQueue *prioq; }; @@ -105,7 +105,7 @@ static void fix_expiry_time(AvahiTimeEvent *e) { e->expiry = now; } -AvahiTimeEventQueue* avahi_time_event_queue_new(AvahiPoll *poll_api) { +AvahiTimeEventQueue* avahi_time_event_queue_new(const AvahiPoll *poll_api) { AvahiTimeEventQueue *q; if (!(q = avahi_new(AvahiTimeEventQueue, 1))) { diff --git a/avahi-core/timeeventq.h b/avahi-core/timeeventq.h index b99c81f..5705eb9 100644 --- a/avahi-core/timeeventq.h +++ b/avahi-core/timeeventq.h @@ -33,7 +33,7 @@ typedef struct AvahiTimeEvent AvahiTimeEvent; typedef void (*AvahiTimeEventCallback)(AvahiTimeEvent *e, void* userdata); -AvahiTimeEventQueue* avahi_time_event_queue_new(AvahiPoll *poll_api); +AvahiTimeEventQueue* avahi_time_event_queue_new(const AvahiPoll *poll_api); void avahi_time_event_queue_free(AvahiTimeEventQueue *q); AvahiTimeEvent* avahi_time_event_new( -- cgit