The attached patch allows avahi-test to run to completion on Solaris.

Padraig

Lennart Poettering wrote:
On Fri, 23.06.06 08:30, Padraig O'Briain ([EMAIL PROTECTED]) wrote:

Where will I find this? I tried the hourly snapshot from http://www.avahi.org/wiki/DownloadAvahi and it seems to be from June
5th.

It does not seem to be for me.

Hmm, It should. I just checked again. The file
     http://0pointer.de/public/avahi-snapshot.tar.gz

contains a current snapshot from a few hours ago.

BTW, I will release 0.6.11 now. If Solaris support is incomplete and
the missing stuff is important we can release a followup release
0.6.12 in a few days. However, the segfault when terminating
avahi-daemon justifies the 0.6.11 release now, I think.

Greetings from GUADEC,
          Lennart

------------------------------------------------------------------------

_______________________________________________
avahi mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/avahi

--- /usr/tmp/clean/avahi-0.6.11/avahi-core/avahi-test.c	2006-06-21 23:38:59.000000000 +0100
+++ ./avahi-test.c	2006-06-26 09:59:12.986578000 +0100
@@ -250,7 +250,7 @@
     AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
     AVAHI_GCC_UNUSED void* userdata) {
 
-    avahi_log_debug("DB: (%i.%i) <%s> [%s]", iface, protocol, domain, browser_event_to_string(event));
+    avahi_log_debug("DB: (%i.%i) <%s> [%s]", iface, protocol, domain ? domain : "NULL", browser_event_to_string(event));
 }
 
 static void stb_callback(
@@ -263,7 +263,7 @@
     AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
     AVAHI_GCC_UNUSED void* userdata) {
 
-    avahi_log_debug("STB: (%i.%i) %s in <%s> [%s]", iface, protocol, service_type, domain, browser_event_to_string(event));
+    avahi_log_debug("STB: (%i.%i) %s in <%s> [%s]", iface, protocol, service_type ? service_type : "NULL", domain ? domain : "NULL", browser_event_to_string(event));
 }
 
 static void sb_callback(
@@ -276,7 +276,7 @@
     const char *domain,
     AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
     AVAHI_GCC_UNUSED void* userdata) {
-    avahi_log_debug("SB: (%i.%i) <%s> as %s in <%s> [%s]", iface, protocol, name, service_type, domain, browser_event_to_string(event));
+    avahi_log_debug("SB: (%i.%i) <%s> as %s in <%s> [%s]", iface, protocol, name ? name : "NULL", service_type ? service_type : "NULL", domain ? domain : "NULL", browser_event_to_string(event));
 }
 
 static void sr_callback(
@@ -323,7 +323,7 @@
     if (a)
         avahi_address_snprint(t, sizeof(t), a);
 
-    avahi_log_debug("DSB: (%i.%i): %s/%s:%i [%s]", iface, protocol, hostname, t, port, browser_event_to_string(event));
+    avahi_log_debug("DSB: (%i.%i): %s/%s:%i [%s]", iface, protocol, hostname ? hostname : "NULL", t, port, browser_event_to_string(event));
 }
 
 int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
_______________________________________________
avahi mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/avahi

Reply via email to