From 854f901f491ccda79aee11edc3d59109cb229d28 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 26 Oct 2005 21:27:40 +0000 Subject: * avahi-utils: replace python avahi-browse with a version written in C. * remove -Wunused from GCC command line and use "unused" attribute instead * remove AVAHI_CLIENT_S_FAILURE and AVAHI_CLIENT_S_INVALID since these event's are never forwarded to the client anyway * make use of AVAHI_GCC_NORETURN * really send eror code with StateChange DBUS signals * ignore EINTR in avahi_simple_poll_loop() git-svn-id: file:///home/lennart/svn/public/avahi/trunk@879 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/client-test.c | 26 +++++++++++++------------- avahi-client/client.c | 18 ++++++++---------- avahi-client/client.h | 2 -- avahi-client/srv-test.c | 18 +++++++++--------- 4 files changed, 30 insertions(+), 34 deletions(-) (limited to 'avahi-client') diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c index 5c9c092..775eb5d 100644 --- a/avahi-client/client-test.c +++ b/avahi-client/client-test.c @@ -57,7 +57,7 @@ static void avahi_domain_browser_callback( AvahiProtocol protocol, AvahiBrowserEvent event, const char *domain, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { printf ("DOMAIN-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, domain, (char*)userdata); @@ -75,7 +75,7 @@ static void avahi_service_resolver_callback( const AvahiAddress *a, uint16_t port, AvahiStringList *txt, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { char addr[64]; @@ -98,7 +98,7 @@ static void avahi_service_browser_callback ( const char *name, const char *type, const char *domain, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { AvahiServiceResolver *sr; @@ -119,20 +119,20 @@ static void avahi_service_type_browser_callback ( AvahiBrowserEvent event, const char *type, const char *domain, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { printf ("SERVICE-TYPE-BROWSER: Callback on %p, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", (void*) b, interface, protocol, event, type, domain, (char*)userdata); } static void avahi_address_resolver_callback ( - AvahiAddressResolver *r, + AVAHI_GCC_UNUSED AvahiAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const AvahiAddress *address, const char *name, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { char addr[64]; @@ -151,7 +151,7 @@ static void avahi_host_name_resolver_callback ( AvahiResolverEvent event, const char *name, const AvahiAddress *a, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void *userdata) { AvahiClient *client; @@ -173,21 +173,21 @@ static void avahi_host_name_resolver_callback ( avahi_address_snprint (addr, sizeof (addr), a); printf ("HOST-NAME-RESOLVER: Callback on HostNameResolver, interface (%d), protocol (%d), event (%d), name (%s), address (%s), data (%s)\n", interface, protocol, event, name, addr, (char*)userdata); } -static void test_free_domain_browser(AvahiTimeout *timeout, void* userdata) +static void test_free_domain_browser(AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiServiceBrowser *b = userdata; printf ("Freeing domain browser\n"); avahi_service_browser_free (b); } -static void test_free_entry_group (AvahiTimeout *timeout, void* userdata) +static void test_free_entry_group (AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiEntryGroup *g = userdata; printf ("Freeing entry group\n"); avahi_entry_group_free (g); } -static void test_entry_group_reset (AvahiTimeout *timeout, void* userdata) +static void test_entry_group_reset (AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiEntryGroup *g = userdata; @@ -199,7 +199,7 @@ static void test_entry_group_reset (AvahiTimeout *timeout, void* userdata) avahi_entry_group_commit (g); } -static void test_entry_group_update(AvahiTimeout *timeout, void* userdata) { +static void test_entry_group_update(AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiEntryGroup *g = userdata; printf ("Updating entry group\n"); @@ -207,12 +207,12 @@ static void test_entry_group_update(AvahiTimeout *timeout, void* userdata) { avahi_entry_group_update_service_txt(g, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, "foo=bar3", NULL); } -static void terminate(AvahiTimeout *timeout, void *userdata) { +static void terminate(AVAHI_GCC_UNUSED AvahiTimeout *timeout, AVAHI_GCC_UNUSED void *userdata) { avahi_simple_poll_quit(simple_poll); } -int main (int argc, char *argv[]) { +int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { AvahiClient *avahi; AvahiEntryGroup *group, *group2; AvahiDomainBrowser *domain; diff --git a/avahi-client/client.c b/avahi-client/client.c index 915ba31..ce4cfa0 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -72,7 +72,6 @@ static void client_set_state (AvahiClient *client, AvahiServerState state) { case AVAHI_CLIENT_S_COLLISION: case AVAHI_CLIENT_S_REGISTERING: - case AVAHI_CLIENT_S_FAILURE: /* Clear cached strings */ avahi_free(client->host_name); @@ -84,7 +83,6 @@ static void client_set_state (AvahiClient *client, AvahiServerState state) { client->domain_name = NULL; break; - case AVAHI_CLIENT_S_INVALID: case AVAHI_CLIENT_S_RUNNING: break; @@ -119,12 +117,12 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, } if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) { char *name, *old, *new; - if (!(dbus_message_get_args( + if (!dbus_message_get_args( message, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old, DBUS_TYPE_STRING, &new, - DBUS_TYPE_INVALID) || dbus_error_is_set (&error))) { + DBUS_TYPE_INVALID) || dbus_error_is_set (&error)) { fprintf(stderr, "WARNING: Failed to parse NameOwnerChanged signal: %s\n", error.message); goto fail; @@ -140,14 +138,14 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_SERVER, "StateChanged")) { int32_t state; - char *e; + char *e = NULL; int c; - if (!(dbus_message_get_args( + if (!dbus_message_get_args( message, &error, DBUS_TYPE_INT32, &state, DBUS_TYPE_STRING, &e, - DBUS_TYPE_INVALID) || dbus_error_is_set (&error))) { + DBUS_TYPE_INVALID) || dbus_error_is_set (&error)) { fprintf(stderr, "WARNING: Failed to parse Server.StateChanged signal: %s\n", error.message); goto fail; } @@ -171,11 +169,11 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, char *e; int c; - if (!(dbus_message_get_args( + if (!dbus_message_get_args( message, &error, DBUS_TYPE_INT32, &state, DBUS_TYPE_STRING, &e, - DBUS_TYPE_INVALID)) || + DBUS_TYPE_INVALID) || dbus_error_is_set(&error)) { fprintf(stderr, "WARNING: Failed to parse EntryGroup.StateChanged signal: %s\n", error.message); goto fail; @@ -261,7 +259,7 @@ static int get_server_state(AvahiClient *client, int *ret_error) { if (!reply || dbus_error_is_set (&error)) goto fail; - if (!(dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &state, DBUS_TYPE_INVALID)) || + if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &state, DBUS_TYPE_INVALID) || dbus_error_is_set (&error)) goto fail; diff --git a/avahi-client/client.h b/avahi-client/client.h index 4f2250b..5128bd9 100644 --- a/avahi-client/client.h +++ b/avahi-client/client.h @@ -43,11 +43,9 @@ typedef struct AvahiClient AvahiClient; /** States of a client object, a superset of AvahiServerState */ typedef enum { - AVAHI_CLIENT_S_INVALID = AVAHI_SERVER_INVALID, AVAHI_CLIENT_S_REGISTERING = AVAHI_SERVER_REGISTERING, AVAHI_CLIENT_S_RUNNING = AVAHI_SERVER_RUNNING, AVAHI_CLIENT_S_COLLISION = AVAHI_SERVER_COLLISION, - AVAHI_CLIENT_S_FAILURE = AVAHI_SERVER_FAILURE, AVAHI_CLIENT_DISCONNECTED = 100 /**< Lost DBUS connection to the Avahi daemon */ } AvahiClientState; diff --git a/avahi-client/srv-test.c b/avahi-client/srv-test.c index 4e0959e..8ac7b68 100644 --- a/avahi-client/srv-test.c +++ b/avahi-client/srv-test.c @@ -33,24 +33,24 @@ #include static void callback( - AvahiServiceResolver *r, - AvahiIfIndex interface, - AvahiProtocol protocol, + AVAHI_GCC_UNUSED AvahiServiceResolver *r, + AVAHI_GCC_UNUSED AvahiIfIndex interface, + AVAHI_GCC_UNUSED AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, - const AvahiAddress *a, - uint16_t port, - AvahiStringList *txt, - AvahiLookupResultFlags flags, - void *userdata) { + AVAHI_GCC_UNUSED const AvahiAddress *a, + AVAHI_GCC_UNUSED uint16_t port, + AVAHI_GCC_UNUSED AvahiStringList *txt, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void *userdata) { fprintf(stderr, "%i name=%s type=%s domain=%s host=%s\n", event, name, type, domain, host_name); } -int main(int argc, char *argv[]) { +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { AvahiSimplePoll *simple_poll; const AvahiPoll *poll_api; -- cgit