From c526a85bcdb32f84e6ade05ce647a431f6a07c10 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 7 May 2005 13:57:19 +0000 Subject: [PATCH] remove _ prefix from structure name (for doxygen) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@64 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/announce.h | 4 ++-- avahi-core/cache.h | 5 ++--- avahi-core/core.h | 8 ++++---- avahi-core/dns.h | 2 +- avahi-core/iface.h | 16 ++++++++-------- avahi-core/netlink.c | 2 +- avahi-core/netlink.h | 3 +-- avahi-core/prioq.h | 10 ++++------ avahi-core/psched.h | 20 ++++++++++---------- avahi-core/server.h | 6 +++--- avahi-core/strlst.h | 8 +++----- avahi-core/subscribe.h | 2 +- avahi-core/timeeventq.h | 8 ++++---- 13 files changed, 44 insertions(+), 50 deletions(-) diff --git a/avahi-core/announce.h b/avahi-core/announce.h index 71b2f03..389c7ca 100644 --- a/avahi-core/announce.h +++ b/avahi-core/announce.h @@ -24,7 +24,7 @@ #include -typedef struct _AvahiAnnouncement AvahiAnnouncement; +typedef struct AvahiAnnouncement AvahiAnnouncement; #include "llist.h" #include "iface.h" @@ -38,7 +38,7 @@ typedef enum { AVAHI_ESTABLISHED } AvahiAnnouncementState; -struct _AvahiAnnouncement { +struct AvahiAnnouncement { AvahiServer *server; AvahiInterface *interface; AvahiEntry *entry; diff --git a/avahi-core/cache.h b/avahi-core/cache.h index d64b3ee..3f05b8e 100644 --- a/avahi-core/cache.h +++ b/avahi-core/cache.h @@ -24,8 +24,7 @@ #include -struct _AvahiCache; -typedef struct _AvahiCache AvahiCache; +typedef struct AvahiCache AvahiCache; #include "prioq.h" #include "server.h" @@ -57,7 +56,7 @@ struct AvahiCacheEntry { AVAHI_LLIST_FIELDS(AvahiCacheEntry, entry); }; -struct _AvahiCache { +struct AvahiCache { AvahiServer *server; AvahiInterface *interface; diff --git a/avahi-core/core.h b/avahi-core/core.h index 750dee1..42e6ee0 100644 --- a/avahi-core/core.h +++ b/avahi-core/core.h @@ -25,9 +25,9 @@ #include #include -typedef struct _AvahiServer AvahiServer; -typedef struct _AvahiEntry AvahiEntry; -typedef struct _AvahiEntryGroup AvahiEntryGroup; +typedef struct AvahiServer AvahiServer; +typedef struct AvahiEntry AvahiEntry; +typedef struct AvahiEntryGroup AvahiEntryGroup; #include #include @@ -154,7 +154,7 @@ typedef enum { AVAHI_SUBSCRIPTION_CHANGE } AvahiSubscriptionEvent; -typedef struct _AvahiSubscription AvahiSubscription; +typedef struct AvahiSubscription AvahiSubscription; typedef void (*AvahiSubscriptionCallback)(AvahiSubscription *s, AvahiRecord *record, gint interface, guchar protocol, AvahiSubscriptionEvent event, gpointer userdata); diff --git a/avahi-core/dns.h b/avahi-core/dns.h index 61a9cb6..7936bae 100644 --- a/avahi-core/dns.h +++ b/avahi-core/dns.h @@ -29,7 +29,7 @@ #define AVAHI_DNS_PACKET_MAX_SIZE 9000 #define AVAHI_DNS_PACKET_HEADER_SIZE 12 -typedef struct _AvahiDnsPacket { +typedef struct AvahiDnsPacket { guint size, rindex, max_size; GHashTable *name_table; /* for name compression */ } AvahiDnsPacket; diff --git a/avahi-core/iface.h b/avahi-core/iface.h index 74136aa..bedf331 100644 --- a/avahi-core/iface.h +++ b/avahi-core/iface.h @@ -24,10 +24,10 @@ #include -typedef struct _AvahiInterfaceMonitor AvahiInterfaceMonitor; -typedef struct _AvahiInterfaceAddress AvahiInterfaceAddress; -typedef struct _AvahiInterface AvahiInterface; -typedef struct _AvahiHwInterface AvahiHwInterface; +typedef struct AvahiInterfaceMonitor AvahiInterfaceMonitor; +typedef struct AvahiInterfaceAddress AvahiInterfaceAddress; +typedef struct AvahiInterface AvahiInterface; +typedef struct AvahiHwInterface AvahiHwInterface; #include "address.h" #include "server.h" @@ -38,7 +38,7 @@ typedef struct _AvahiHwInterface AvahiHwInterface; #include "dns.h" #include "announce.h" -struct _AvahiInterfaceMonitor { +struct AvahiInterfaceMonitor { AvahiServer *server; AvahiNetlink *netlink; GHashTable *hash_table; @@ -55,7 +55,7 @@ struct _AvahiInterfaceMonitor { } list; }; -struct _AvahiHwInterface { +struct AvahiHwInterface { AVAHI_LLIST_FIELDS(AvahiHwInterface, hardware); AvahiInterfaceMonitor *monitor; @@ -67,7 +67,7 @@ struct _AvahiHwInterface { AVAHI_LLIST_HEAD(AvahiInterface, interfaces); }; -struct _AvahiInterface { +struct AvahiInterface { AVAHI_LLIST_FIELDS(AvahiInterface, interface); AVAHI_LLIST_FIELDS(AvahiInterface, by_hardware); AvahiInterfaceMonitor *monitor; @@ -83,7 +83,7 @@ struct _AvahiInterface { AVAHI_LLIST_HEAD(AvahiAnnouncement, announcements); }; -struct _AvahiInterfaceAddress { +struct AvahiInterfaceAddress { AVAHI_LLIST_FIELDS(AvahiInterfaceAddress, address); AvahiInterfaceMonitor *monitor; diff --git a/avahi-core/netlink.c b/avahi-core/netlink.c index 92ed436..e3cc3fa 100644 --- a/avahi-core/netlink.c +++ b/avahi-core/netlink.c @@ -29,7 +29,7 @@ #include "netlink.h" -struct _AvahiNetlink { +struct AvahiNetlink { GMainContext *context; gint fd; guint seq; diff --git a/avahi-core/netlink.h b/avahi-core/netlink.h index f6be54a..748eb5d 100644 --- a/avahi-core/netlink.h +++ b/avahi-core/netlink.h @@ -28,8 +28,7 @@ #include -struct _AvahiNetlink; -typedef struct _AvahiNetlink AvahiNetlink; +typedef struct AvahiNetlink AvahiNetlink; AvahiNetlink *avahi_netlink_new(GMainContext *c, gint priority, guint32 groups, void (*cb) (AvahiNetlink *n, struct nlmsghdr *m, gpointer userdata), gpointer userdata); void avahi_netlink_free(AvahiNetlink *n); diff --git a/avahi-core/prioq.h b/avahi-core/prioq.h index 6651071..e6105d8 100644 --- a/avahi-core/prioq.h +++ b/avahi-core/prioq.h @@ -24,20 +24,18 @@ #include -struct _AvahiPrioQueue; -typedef struct _AvahiPrioQueue AvahiPrioQueue; +typedef struct AvahiPrioQueue AvahiPrioQueue; -struct _AvahiPrioQueueNode; -typedef struct _AvahiPrioQueueNode AvahiPrioQueueNode; +typedef struct AvahiPrioQueueNode AvahiPrioQueueNode; -struct _AvahiPrioQueue { +struct AvahiPrioQueue { AvahiPrioQueueNode *root, *last; guint n_nodes; gint (*compare) (gconstpointer a, gconstpointer b); }; -struct _AvahiPrioQueueNode { +struct AvahiPrioQueueNode { AvahiPrioQueue *queue; gpointer data; guint x, y; diff --git a/avahi-core/psched.h b/avahi-core/psched.h index 72f8ef0..fe621ca 100644 --- a/avahi-core/psched.h +++ b/avahi-core/psched.h @@ -22,18 +22,18 @@ USA. ***/ -typedef struct _AvahiQueryJob AvahiQueryJob; -typedef struct _AvahiResponseJob AvahiResponseJob; -typedef struct _AvahiPacketScheduler AvahiPacketScheduler; -typedef struct _AvahiKnownAnswer AvahiKnownAnswer; -typedef struct _AvahiProbeJob AvahiProbeJob; +typedef struct AvahiQueryJob AvahiQueryJob; +typedef struct AvahiResponseJob AvahiResponseJob; +typedef struct AvahiPacketScheduler AvahiPacketScheduler; +typedef struct AvahiKnownAnswer AvahiKnownAnswer; +typedef struct AvahiProbeJob AvahiProbeJob; #include "timeeventq.h" #include "rr.h" #include "llist.h" #include "iface.h" -struct _AvahiQueryJob { +struct AvahiQueryJob { AvahiPacketScheduler *scheduler; AvahiTimeEvent *time_event; AvahiKey *key; @@ -42,7 +42,7 @@ struct _AvahiQueryJob { AVAHI_LLIST_FIELDS(AvahiQueryJob, jobs); }; -struct _AvahiResponseJob { +struct AvahiResponseJob { AvahiPacketScheduler *scheduler; AvahiTimeEvent *time_event; AvahiRecord *record; @@ -54,14 +54,14 @@ struct _AvahiResponseJob { AVAHI_LLIST_FIELDS(AvahiResponseJob, jobs); }; -struct _AvahiKnownAnswer { +struct AvahiKnownAnswer { AvahiPacketScheduler *scheduler; AvahiRecord *record; AVAHI_LLIST_FIELDS(AvahiKnownAnswer, known_answer); }; -struct _AvahiProbeJob { +struct AvahiProbeJob { AvahiPacketScheduler *scheduler; AvahiTimeEvent *time_event; AvahiRecord *record; @@ -72,7 +72,7 @@ struct _AvahiProbeJob { AVAHI_LLIST_FIELDS(AvahiProbeJob, jobs); }; -struct _AvahiPacketScheduler { +struct AvahiPacketScheduler { AvahiServer *server; AvahiInterface *interface; diff --git a/avahi-core/server.h b/avahi-core/server.h index 4290cb0..6767884 100644 --- a/avahi-core/server.h +++ b/avahi-core/server.h @@ -30,7 +30,7 @@ #include "announce.h" #include "subscribe.h" -struct _AvahiEntry { +struct AvahiEntry { AvahiServer *server; AvahiEntryGroup *group; @@ -48,7 +48,7 @@ struct _AvahiEntry { AVAHI_LLIST_HEAD(AvahiAnnouncement, announcements); }; -struct _AvahiEntryGroup { +struct AvahiEntryGroup { AvahiServer *server; gboolean dead; @@ -62,7 +62,7 @@ struct _AvahiEntryGroup { AVAHI_LLIST_HEAD(AvahiEntry, entries); }; -struct _AvahiServer { +struct AvahiServer { GMainContext *context; AvahiInterfaceMonitor *monitor; diff --git a/avahi-core/strlst.h b/avahi-core/strlst.h index 42377c0..80dfc2c 100644 --- a/avahi-core/strlst.h +++ b/avahi-core/strlst.h @@ -24,13 +24,11 @@ #include -typedef struct _AvahiStringList AvahiStringList; - -struct _AvahiStringList { - AvahiStringList *next; +typedef struct AvahiStringList { + struct AvahiStringList *next; guint size; guint8 text[1]; -}; +} AvahiStringList; AvahiStringList *avahi_string_list_new(const gchar *txt, ...); AvahiStringList *avahi_string_list_new_va(va_list va); diff --git a/avahi-core/subscribe.h b/avahi-core/subscribe.h index 807e79e..0290085 100644 --- a/avahi-core/subscribe.h +++ b/avahi-core/subscribe.h @@ -28,7 +28,7 @@ #include "timeeventq.h" #include "server.h" -struct _AvahiSubscription { +struct AvahiSubscription { AvahiServer *server; AvahiKey *key; gint interface; diff --git a/avahi-core/timeeventq.h b/avahi-core/timeeventq.h index 26ced90..4a668c0 100644 --- a/avahi-core/timeeventq.h +++ b/avahi-core/timeeventq.h @@ -22,12 +22,12 @@ USA. ***/ -typedef struct _AvahiTimeEventQueue AvahiTimeEventQueue; -typedef struct _AvahiTimeEvent AvahiTimeEvent; +typedef struct AvahiTimeEventQueue AvahiTimeEventQueue; +typedef struct AvahiTimeEvent AvahiTimeEvent; #include "prioq.h" -struct _AvahiTimeEvent { +struct AvahiTimeEvent { AvahiTimeEventQueue *queue; AvahiPrioQueueNode *node; GTimeVal expiry; @@ -35,7 +35,7 @@ struct _AvahiTimeEvent { void *userdata; }; -struct _AvahiTimeEventQueue { +struct AvahiTimeEventQueue { GSource source; AvahiPrioQueue *prioq; }; -- 2.39.5