From 012a5048366fb661ce37287dcf6de60497f102dc Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 14 Nov 2009 02:35:10 +0100
Subject: fix various compiler warnings

---
 avahi-common/strlst-test.c  | 28 ++++++++++++++--------------
 avahi-common/timeval-test.c |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'avahi-common')

diff --git a/avahi-common/strlst-test.c b/avahi-common/strlst-test.c
index 71f748d..b9a7baa 100644
--- a/avahi-common/strlst-test.c
+++ b/avahi-common/strlst-test.c
@@ -2,17 +2,17 @@
 
 /***
   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
@@ -37,7 +37,7 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED 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");
@@ -50,18 +50,18 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     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)
@@ -71,11 +71,11 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     }
 
     printf("\n");
-    
+
     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);
@@ -92,12 +92,12 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED 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);
@@ -113,7 +113,7 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     printf("<%s>=<%s>\n", t, v);
     avahi_free(t);
     avahi_free(v);
-    
+
     avahi_string_list_free(a);
     avahi_string_list_free(b);
 
@@ -124,6 +124,6 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
 
     assert(avahi_string_list_parse(data, size, &a) == 0);
     assert(!a);
-    
+
     return 0;
 }
diff --git a/avahi-common/timeval-test.c b/avahi-common/timeval-test.c
index 92fcab2..553c37e 100644
--- a/avahi-common/timeval-test.c
+++ b/avahi-common/timeval-test.c
@@ -2,17 +2,17 @@
 
 /***
   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
@@ -39,7 +39,7 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
 
     printf("%li.%li\n", a.tv_sec, a.tv_usec);
 
-    printf("%lli\n", avahi_timeval_diff(&a, &b));
+    printf("%lli\n", (long long) avahi_timeval_diff(&a, &b));
 
     return 0;
 }
-- 
cgit