Rename flx_* to avahi_*

[catta] / strlst.c

diff --git a/strlst.c b/strlst.c
index 417d423809430b8a9261448a2a5bcb1cb0dae5dc..f2d76e4dc47980309d2f6f1927499b5e993b1a61 100644 (file)
--- a/strlst.c
+++ b/strlst.c
@@ -3,26 +3,26 @@
 
 #include "strlst.h"
 
-flxStringList *flx_string_list_add_arbitrary(flxStringList *l, const guint8*text, guint size) {
-    flxStringList *n;
+AvahiStringList *avahi_string_list_add_arbitrary(AvahiStringList *l, const guint8*text, guint size) {
+    AvahiStringList *n;
 
     g_assert(text);
 
-    n = g_malloc(sizeof(flxStringList) + size);
+    n = g_malloc(sizeof(AvahiStringList) + size);
     n->next = l;
     memcpy(n->text, text, n->size = size);
     
     return n;
 }
 
-flxStringList *flx_string_list_add(flxStringList *l, const gchar *text) {
+AvahiStringList *avahi_string_list_add(AvahiStringList *l, const gchar *text) {
     g_assert(text);
 
-    return flx_string_list_add_arbitrary(l, (const guint8*) text, strlen(text));
+    return avahi_string_list_add_arbitrary(l, (const guint8*) text, strlen(text));
 }
 
-flxStringList *flx_string_list_parse(gconstpointer data, guint size) {
-    flxStringList *r = NULL;
+AvahiStringList *avahi_string_list_parse(gconstpointer data, guint size) {
+    AvahiStringList *r = NULL;
     const guint8 *c;
     g_assert(data);
 
@@ -34,7 +34,7 @@ flxStringList *flx_string_list_parse(gconstpointer data, guint size) {
             break;
 
         k = *(c++);
-        r = flx_string_list_add_arbitrary(r, c, k);
+        r = avahi_string_list_add_arbitrary(r, c, k);
         c += k;
 
         size -= 1 + k;
@@ -43,8 +43,8 @@ flxStringList *flx_string_list_parse(gconstpointer data, guint size) {
     return r;
 }
 
-void flx_string_list_free(flxStringList *l) {
-    flxStringList *n;
+void avahi_string_list_free(AvahiStringList *l) {
+    AvahiStringList *n;
 
     while (l) {
         n = l->next;
@@ -53,8 +53,8 @@ void flx_string_list_free(flxStringList *l) {
     }
 }
 
-static flxStringList* string_list_reverse(flxStringList *l) {
-    flxStringList *r = NULL, *n;
+static AvahiStringList* string_list_reverse(AvahiStringList *l) {
+    AvahiStringList *r = NULL, *n;
 
     while (l) {
         n = l->next;
@@ -66,8 +66,8 @@ static flxStringList* string_list_reverse(flxStringList *l) {
     return r;
 }
 
-gchar* flx_string_list_to_string(flxStringList *l) {
-    flxStringList *n;
+gchar* avahi_string_list_to_string(AvahiStringList *l) {
+    AvahiStringList *n;
     guint s = 0;
     gchar *t, *e;
 
@@ -100,12 +100,12 @@ gchar* flx_string_list_to_string(flxStringList *l) {
     return t;
 }
 
-guint flx_string_list_serialize(flxStringList *l, gpointer data, guint size) {
+guint avahi_string_list_serialize(AvahiStringList *l, gpointer data, guint size) {
     guint used = 0;
 
     if (data) {
         guint8 *c;
-        flxStringList *n;
+        AvahiStringList *n;
     
         g_assert(data);
         
@@ -133,7 +133,7 @@ guint flx_string_list_serialize(flxStringList *l, gpointer data, guint size) {
         
         l = string_list_reverse(l);
     } else {
-        flxStringList *n;
+        AvahiStringList *n;
 
         for (n = l; n; n = n->next) {
             guint k;
@@ -149,7 +149,7 @@ guint flx_string_list_serialize(flxStringList *l, gpointer data, guint size) {
     return used;
 }
 
-gboolean flx_string_list_equal(flxStringList *a, flxStringList *b) {
+gboolean avahi_string_list_equal(AvahiStringList *a, AvahiStringList *b) {
 
     for (;;) {
         if (!a && !b)
@@ -169,50 +169,50 @@ gboolean flx_string_list_equal(flxStringList *a, flxStringList *b) {
     }
 }
 
-flxStringList *flx_string_list_add_many(flxStringList *r, ...) {
+AvahiStringList *avahi_string_list_add_many(AvahiStringList *r, ...) {
     va_list va;
 
     va_start(va, r);
-    r = flx_string_list_add_many_va(r, va);
+    r = avahi_string_list_add_many_va(r, va);
     va_end(va);
     
     return r;
 }
 
-flxStringList *flx_string_list_add_many_va(flxStringList *r, va_list va) {
+AvahiStringList *avahi_string_list_add_many_va(AvahiStringList *r, va_list va) {
     const gchar *txt;
 
     while ((txt = va_arg(va, const gchar*)))
-        r = flx_string_list_add(r, txt);
+        r = avahi_string_list_add(r, txt);
 
     return r;
 }
 
 
-flxStringList *flx_string_list_new(const gchar *txt, ...) {
+AvahiStringList *avahi_string_list_new(const gchar *txt, ...) {
     va_list va;
-    flxStringList *r = NULL;
+    AvahiStringList *r = NULL;
 
     if (txt) {
-        r = flx_string_list_add(r, txt);
+        r = avahi_string_list_add(r, txt);
 
         va_start(va, txt);
-        r = flx_string_list_add_many_va(r, va);
+        r = avahi_string_list_add_many_va(r, va);
         va_end(va);
     }
 
     return r;
 }
 
-flxStringList *flx_string_list_new_va(va_list va) {
-    return flx_string_list_add_many_va(NULL, va);
+AvahiStringList *avahi_string_list_new_va(va_list va) {
+    return avahi_string_list_add_many_va(NULL, va);
 }
 
-flxStringList *flx_string_list_copy(flxStringList *l) {
-    flxStringList *r = NULL;
+AvahiStringList *avahi_string_list_copy(AvahiStringList *l) {
+    AvahiStringList *r = NULL;
 
     for (; l; l = l->next)
-        r = flx_string_list_add_arbitrary(r, l->text, l->size);
+        r = avahi_string_list_add_arbitrary(r, l->text, l->size);
 
     return string_list_reverse(r);
 }