* Some minor cleanups in netlink code

[catta] / avahi-common / watch-test.c

diff --git a/avahi-common/watch-test.c b/avahi-common/watch-test.c
index f87a30301858f58e7529167dafd6db24bb4d3f96..921a8f70f468647ea7c7af6b1b1f54e2335378e9 100644 (file)
--- a/avahi-common/watch-test.c
+++ b/avahi-common/watch-test.c
@@ -33,7 +33,8 @@
 #include "simple-watch.h"
 #include "timeval.h"
 
-static AvahiPoll *api = NULL;
+static const AvahiPoll *api = NULL;
+static AvahiSimplePoll *simple_poll = NULL;
 
 static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdata) {
 
@@ -51,31 +52,36 @@ static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdat
     }
 }
 
+static void wakeup(AvahiTimeout *t, void *userdata) {
+    static int i = 0;
+    struct timeval tv;
+
+    printf("Wakeup #%i\n", i++);
+
+    if (i > 10)
+        avahi_simple_poll_quit(simple_poll);
+    else {
+        avahi_elapse_time(&tv, 1000, 0);
+        api->timeout_update(t, &tv);
+    }
+}
+
 int main(int argc, char *argv[]) {
-    int i = 0;
-    AvahiSimplePoll *s;
+    struct timeval tv;
     
-    s = avahi_simple_poll_new();
-    assert(s);
-
-    api = avahi_simple_poll_get(s);
+    simple_poll = avahi_simple_poll_new();
 
+    api = avahi_simple_poll_get(simple_poll);
     api->watch_new(api, 0, AVAHI_WATCH_IN, callback, NULL);
 
-    for (;;) {
-        struct timeval tv;
-        printf("Iteration %i\n", i++);
+    avahi_elapse_time(&tv, 1000, 0);
+    api->timeout_new(api, &tv, wakeup, NULL);
 
-        if (i > 100)
-            avahi_simple_poll_quit(s);
+    /* Our main loop */
+    avahi_simple_poll_loop(simple_poll);
 
-        avahi_elapse_time(&tv, 1000, 0);
-        
-        api->set_wakeup_time(api, &tv);
-        
-        if (avahi_simple_poll_iterate(s, 1) != 0)
-            break;
-    }
+
+    avahi_simple_poll_free(simple_poll);
     
     return 0;
 }