hide "Bad probe size estimate" warning in probe code which was generated when assembl...

[catta] / avahi-core / probe-sched.c

diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c
index 8a4d8b030c5c3f64d7f42a0056b5412d31360386..f430bce2ca3b4fbaeca0b051e8d906f65b74446a 100644 (file)
--- a/avahi-core/probe-sched.c
+++ b/avahi-core/probe-sched.c
@@ -23,12 +23,15 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <avahi-common/domain.h>
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>
 
 #include "probe-sched.h"
 #include "log.h"
+#include "rr-util.h"
 
 #define AVAHI_PROBE_HISTORY_MSEC 150
 #define AVAHI_PROBE_DEFER_MSEC 50
@@ -213,7 +216,7 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
     return 1;
 }
 
-static void elapse_callback(AvahiTimeEvent *e, void* data) {
+static void elapse_callback(AVAHI_GCC_UNUSED AvahiTimeEvent *e, void* data) {
     AvahiProbeJob *pj = data, *next;
     AvahiProbeScheduler *s;
     AvahiDnsPacket *p;
@@ -247,8 +250,8 @@ static void elapse_callback(AvahiTimeEvent *e, void* data) {
             avahi_record_get_estimate_size(pj->record) +
             AVAHI_DNS_PACKET_HEADER_SIZE;
         
-        if (size > AVAHI_DNS_PACKET_MAX_SIZE)
-            size = AVAHI_DNS_PACKET_MAX_SIZE;
+        if (size > AVAHI_DNS_PACKET_SIZE_MAX)
+            size = AVAHI_DNS_PACKET_SIZE_MAX;
 
         if (!(p = avahi_dns_packet_new_query(size)))
             return; /* OOM */
@@ -299,7 +302,7 @@ static void elapse_callback(AvahiTimeEvent *e, void* data) {
             continue;
 
         if (!avahi_dns_packet_append_record(p, pj->record, 0, 0)) {
-            avahi_log_warn("Bad probe size estimate!");
+/*             avahi_log_warn("Bad probe size estimate!"); */
 
             /* Unmark all following jobs */
             for (; pj; pj = pj->jobs_next)