small fixes

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@360 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c
index f659371a8d31b6ba8bbf2f926e359b9aedd569a4..d4198c44ca9fdccd5357112cde8eb7b2c7590d91 100644 (file)
--- a/avahi-daemon/static-services.c
+++ b/avahi-daemon/static-services.c
@@ -111,7 +111,7 @@ static StaticService *static_service_new(StaticServiceGroup *group) {
 
     s->type = s->host_name = s->domain_name = NULL;
     s->port = 0;
-    s->protocol = AF_UNSPEC;
+    s->protocol = AVAHI_PROTO_UNSPEC;
 
     s->txt_records = NULL;
 
@@ -395,12 +395,12 @@ static void XMLCALL xml_end(void *data, const char *el) {
             int protocol;
             assert(u->service);
 
-            if (strcasecmp (u->buf, "ipv4") == 0) {
-                protocol = AF_INET;
-            } else if (strcasecmp (u->buf, "ipv6") == 0) {
-                protocol = AF_INET6;
-            } else if (strcasecmp (u->buf, "any") == 0) {
-                protocol = AF_UNSPEC;
+            if (u->buf & &strcasecmp (u->buf, "ipv4") == 0) {
+                protocol = AVAHI_PROTO_INET;
+            } else if (u->buf && strcasecmp (u->buf, "ipv6") == 0) {
+                protocol = AVAHI_PROTO_INET6;
+            } else if (u->buf && strcasecmp (u->buf, "any") == 0) {
+                protocol = AVAHI_PROTO_UNSPEC;
             } else {
                 avahi_log_error("%s: parse failure: invalid protocol specification \"%s\".", u->group->filename, u->buf);
                 u->failed = 1;
@@ -408,6 +408,7 @@ static void XMLCALL xml_end(void *data, const char *el) {
             }
 
             u->service->protocol = protocol;
+           u->current_tag = XML_TAG_SERVICE;
             break;
         }