From 6589afffbb5f484ebc3aa5a7a533eaf0940ac202 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 2 Apr 2011 02:46:01 +0200
Subject: general: various smaller fixes

---
 avahi-client/browser.c  | 3 +--
 avahi-common/utf8.c     | 3 ---
 avahi-core/avahi-test.c | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/avahi-client/browser.c b/avahi-client/browser.c
index f92ed0d..c978d94 100644
--- a/avahi-client/browser.c
+++ b/avahi-client/browser.c
@@ -171,7 +171,7 @@ AvahiDomainBrowser* avahi_domain_browser_new(
               DBUS_TYPE_INT32, &i_protocol,
               DBUS_TYPE_STRING, &domain,
               DBUS_TYPE_INT32, &bt,
-              DBUS_TYPE_UINT32, &flags,
+              DBUS_TYPE_UINT32, &u_flags,
               DBUS_TYPE_INVALID))) {
         avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY);
         goto fail;
@@ -1023,4 +1023,3 @@ fail:
     dbus_error_free (&error);
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
-
diff --git a/avahi-common/utf8.c b/avahi-common/utf8.c
index fa6a318..ab10ba0 100644
--- a/avahi-common/utf8.c
+++ b/avahi-common/utf8.c
@@ -60,9 +60,6 @@ avahi_utf8_valid (const char *str)
 	/* done */;
       else
 	{
-	  const char *last;
-
-	  last = p;
 	  if ((*(const unsigned char *)p & 0xe0) == 0xc0) /* 110xxxxx */
 	    {
 	      if ( ((*(const unsigned char *)p & 0x1e) == 0))
diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 07d7a8d..8b2376f 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -381,6 +381,7 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     avahi_s_record_browser_free(r);
     avahi_s_host_name_resolver_free(hnr);
     avahi_s_address_resolver_free(ar);
+    avahi_s_domain_browser_free(db);
     avahi_s_service_type_browser_free(stb);
     avahi_s_service_browser_free(sb);
     avahi_s_service_resolver_free(sr);
-- 
cgit