Rename flx_* to avahi_*

[catta] / main.c

diff --git a/main.c b/main.c
index 57251628af8d364e7fd32cdc2f39d4ebaec08454..34135c53c7df3fab907b024c9033d67dfd373cad 100644 (file)
--- a/main.c
+++ b/main.c
@@ -3,7 +3,7 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 
-#include "flx.h"
+#include "Avahi.h"
 
 static gboolean quit_timeout(gpointer data) {
     g_main_loop_quit(data);
@@ -11,12 +11,12 @@ static gboolean quit_timeout(gpointer data) {
 }
 
 static gboolean dump_timeout(gpointer data) {
-    flxServer *flx = data;
-    flx_server_dump(flx, stdout);
+    AvahiServer *Avahi = data;
+    avahi_server_dump(Avahi, stdout);
     return TRUE;
 }
 
-static void subscription(flxSubscription *s, flxRecord *r, gint interface, guchar protocol, flxSubscriptionEvent event, gpointer userdata) {
+static void subscription(AvahiSubscription *s, AvahiRecord *r, gint interface, guchar protocol, AvahiSubscriptionEvent event, gpointer userdata) {
     gchar *t;
     
     g_assert(s);
@@ -24,51 +24,51 @@ static void subscription(flxSubscription *s, flxRecord *r, gint interface, gucha
     g_assert(interface > 0);
     g_assert(protocol != AF_UNSPEC);
 
-    g_message("SUBSCRIPTION: record [%s] on %i.%i is %s", t = flx_record_to_string(r), interface, protocol,
-              event == FLX_SUBSCRIPTION_NEW ? "new" : (event == FLX_SUBSCRIPTION_CHANGE ? "changed" : "removed"));
+    g_message("SUBSCRIPTION: record [%s] on %i.%i is %s", t = avahi_record_to_string(r), interface, protocol,
+              event == AVAHI_SUBSCRIPTION_NEW ? "new" : (event == AVAHI_SUBSCRIPTION_CHANGE ? "changed" : "removed"));
 
     g_free(t);
 }
 
-static void entry_group_callback(flxServer *s, flxEntryGroup *g, flxEntryGroupState state, gpointer userdata) {
+static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata) {
     g_message("entry group state: %i", state);
 }
 
 int main(int argc, char *argv[]) {
-    flxServer *flx;
+    AvahiServer *Avahi;
     gchar *r;
     GMainLoop *loop = NULL;
-    flxSubscription *s;
-    flxKey *k;
-    flxEntryGroup *g;
+    AvahiSubscription *s;
+    AvahiKey *k;
+    AvahiEntryGroup *g;
 
-    flx = flx_server_new(NULL);
+    Avahi = avahi_server_new(NULL);
 
-/*     g = flx_entry_group_new(flx, entry_group_callback, NULL);  */
+/*     g = avahi_entry_group_new(Avahi, entry_group_callback, NULL);  */
     
-/*    flx_server_add_text(flx, g, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE, NULL, "hallo", NULL); */
-/*      flx_server_add_service(flx, g, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);  */
+/*    avahi_server_add_text(Avahi, g, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE, NULL, "hallo", NULL); */
+/*      avahi_server_add_service(Avahi, g, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);  */
     
-/*     flx_entry_group_commit(g);  */
+/*     avahi_entry_group_commit(g);  */
 
-    flx_server_dump(flx, stdout);
+    avahi_server_dump(Avahi, stdout);
     
     
-/*     k = flx_key_new("ecstasy.local.", FLX_DNS_CLASS_IN, FLX_DNS_TYPE_ANY); */
-/*     s = flx_subscription_new(flx, k, 0, AF_UNSPEC, subscription, NULL); */
-/*     flx_key_unref(k); */
+/*     k = avahi_key_new("ecstasy.local.", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_ANY); */
+/*     s = avahi_subscription_new(Avahi, k, 0, AF_UNSPEC, subscription, NULL); */
+/*     avahi_key_unref(k); */
 
     loop = g_main_loop_new(NULL, FALSE);
     
-  /*   g_timeout_add(1000*20, dump_timeout, flx); */
+  /*   g_timeout_add(1000*20, dump_timeout, Avahi); */
 /*     g_timeout_add(1000*30, quit_timeout, loop); */
     
     g_main_loop_run(loop);
     g_main_loop_unref(loop);
 
-/*     flx_subscription_free(s); */
-    /* flx_entry_group_free(g);  */
-    flx_server_free(flx);
+/*     avahi_subscription_free(s); */
+    /* avahi_entry_group_free(g);  */
+    avahi_server_free(Avahi);
     
     return 0;
 }