X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fstrlst-test.c;h=0945b3756ec0efdd3f82550214124de50dc994f8;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=b725fa7fd1bdd5fa54cb38b976143356f096bac3;hpb=7bf79a1a47143d0b2d1eb87fe1b938f870edc5b2;p=catta

diff --git a/avahi-common/strlst-test.c b/avahi-common/strlst-test.c
index b725fa7..0945b37 100644
--- a/avahi-common/strlst-test.c
+++ b/avahi-common/strlst-test.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -29,7 +27,7 @@
 #include "strlst.h"
 #include "malloc.h"
 
-int main(int argc, char *argv[]) {
+int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     char *t, *v;
     uint8_t data[1024];
     AvahiStringList *a = NULL, *b, *p;
@@ -37,26 +35,31 @@ int main(int argc, char *argv[]) {
     int r;
 
     a = avahi_string_list_new("prefix", "a", "b", NULL);
-    
+
     a = avahi_string_list_add(a, "start");
     a = avahi_string_list_add(a, "foo=99");
     a = avahi_string_list_add(a, "bar");
+    a = avahi_string_list_add(a, "");
+    a = avahi_string_list_add(a, "");
     a = avahi_string_list_add(a, "quux");
+    a = avahi_string_list_add(a, "");
     a = avahi_string_list_add_arbitrary(a, (const uint8_t*) "null\0null", 9);
     a = avahi_string_list_add_printf(a, "seven=%i %c", 7, 'x');
     a = avahi_string_list_add_pair(a, "blubb", "blaa");
     a = avahi_string_list_add_pair(a, "uxknurz", NULL);
     a = avahi_string_list_add_pair_arbitrary(a, "uxknurz2", (const uint8_t*) "blafasel\0oerks", 14);
-    
+
     a = avahi_string_list_add(a, "end");
 
     t = avahi_string_list_to_string(a);
     printf("--%s--\n", t);
     avahi_free(t);
 
+    n = avahi_string_list_serialize(a, NULL, 0);
     size = avahi_string_list_serialize(a, data, sizeof(data));
+    assert(size == n);
 
-    printf("%u\n", size);
+    printf("%zu\n", size);
 
     for (t = (char*) data, n = 0; n < size; n++, t++) {
         if (*t <= 32)
@@ -66,11 +69,11 @@ int main(int argc, char *argv[]) {
     }
 
     printf("\n");
-    
-    b = avahi_string_list_parse(data, size);
 
-    assert(avahi_string_list_equal(a, b));
-    
+    assert(avahi_string_list_parse(data, size, &b) == 0);
+
+    printf("equal: %i\n", avahi_string_list_equal(a, b));
+
     t = avahi_string_list_to_string(b);
     printf("--%s--\n", t);
     avahi_free(t);
@@ -87,12 +90,12 @@ int main(int argc, char *argv[]) {
 
     p = avahi_string_list_find(a, "seven");
     assert(p);
-    
-    r = avahi_string_list_get_pair(p, &t, &v, NULL);  
+
+    r = avahi_string_list_get_pair(p, &t, &v, NULL);
     assert(r >= 0);
     assert(t);
     assert(v);
-    
+
     printf("<%s>=<%s>\n", t, v);
     avahi_free(t);
     avahi_free(v);
@@ -108,15 +111,17 @@ int main(int argc, char *argv[]) {
     printf("<%s>=<%s>\n", t, v);
     avahi_free(t);
     avahi_free(v);
-    
+
     avahi_string_list_free(a);
     avahi_string_list_free(b);
 
+    n = avahi_string_list_serialize(NULL, NULL, 0);
     size = avahi_string_list_serialize(NULL, data, sizeof(data));
     assert(size == 1);
+    assert(size == n);
 
-    a = avahi_string_list_parse(data, size);
+    assert(avahi_string_list_parse(data, size, &a) == 0);
     assert(!a);
-    
+
     return 0;
 }