general: various smaller fixes

diff --git a/avahi-client/browser.c b/avahi-client/browser.c
index f92ed0d8b65c76a19c9b70671453f97a0a2493d5..c978d942a80e11b64c6a228257ac281d65c38308 100644 (file)
--- 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 fa6a31859bce4d863a5b89bc34a21fbd93119a22..ab10ba06a05238ab8c505fb43939f13c9fb75387 100644 (file)
--- 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 07d7a8de815f8effcfa13fe48f9b17d21f374d46..8b2376fb2fc8bc58332bb19c2009b134f50fdbdc 100644 (file)
--- 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);