* drop glib from avahi-common

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

diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c
index a162dd7c6859228cd06e3eabc5e665dddc6de8c0..ad23234bf2c14c79421b813d0c68c4a163dbca99 100644 (file)
--- a/avahi-core/probe-sched.c
+++ b/avahi-core/probe-sched.c
@@ -25,6 +25,7 @@
 
 #include "probe-sched.h"
 #include "util.h"
+#include "log.h"
 
 #define AVAHI_PROBE_HISTORY_MSEC 150
 #define AVAHI_PROBE_DEFER_MSEC 50
@@ -37,7 +38,7 @@ struct AvahiProbeJob {
     
     gboolean chosen; /* Use for packet assembling */
     gboolean done;
-    GTimeVal delivery;
+    struct timeval delivery;
 
     AvahiRecord *record;
     
@@ -90,7 +91,7 @@ static void job_free(AvahiProbeScheduler *s, AvahiProbeJob *pj) {
 static void elapse_callback(AvahiTimeEvent *e, gpointer data);
 
 static void job_set_elapse_time(AvahiProbeScheduler *s, AvahiProbeJob *pj, guint msec, guint jitter) {
-    GTimeVal tv;
+    struct timeval tv;
 
     g_assert(s);
     g_assert(pj);
@@ -115,7 +116,7 @@ static void job_mark_done(AvahiProbeScheduler *s, AvahiProbeJob *pj) {
     pj->done = TRUE;
 
     job_set_elapse_time(s, pj, AVAHI_PROBE_HISTORY_MSEC, 0);
-    g_get_current_time(&pj->delivery);
+    gettimeofday(&pj->delivery, NULL);
 }
 
 AvahiProbeScheduler *avahi_probe_scheduler_new(AvahiInterface *i) {
@@ -170,7 +171,7 @@ static gboolean packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p
         return FALSE;
 
     /* Create the probe query */
-    k = avahi_key_new(pj->record->key->name, pj->record->key->class, AVAHI_DNS_TYPE_ANY);
+    k = avahi_key_new(pj->record->key->name, pj->record->key->clazz, AVAHI_DNS_TYPE_ANY);
     b = !!avahi_dns_packet_append_key(p, k, FALSE);
     g_assert(b);
 
@@ -183,7 +184,7 @@ static gboolean packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p
             continue;
 
         /* Does the record match the probe? */
-        if (k->class != pj->record->key->class || !avahi_domain_equal(k->name, pj->record->key->name))
+        if (k->clazz != pj->record->key->clazz || !avahi_domain_equal(k->name, pj->record->key->name))
             continue;
         
         /* This job wouldn't fit in */
@@ -237,7 +238,7 @@ static void elapse_callback(AvahiTimeEvent *e, gpointer data) {
         
         p = avahi_dns_packet_new_query(size);
 
-        k = avahi_key_new(pj->record->key->name, pj->record->key->class, AVAHI_DNS_TYPE_ANY);
+        k = avahi_key_new(pj->record->key->name, pj->record->key->clazz, AVAHI_DNS_TYPE_ANY);
         b = avahi_dns_packet_append_key(p, k, FALSE) && avahi_dns_packet_append_record(p, pj->record, FALSE, 0);
         avahi_key_unref(k);
 
@@ -246,7 +247,7 @@ static void elapse_callback(AvahiTimeEvent *e, gpointer data) {
             avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_QDCOUNT, 1);
             avahi_interface_send_packet(s->interface, p);
         } else
-            g_warning("Probe record too large, cannot send");   
+            avahi_log_warn("Probe record too large, cannot send");   
         
         avahi_dns_packet_free(p);
         job_mark_done(s, pj);
@@ -279,7 +280,7 @@ static void elapse_callback(AvahiTimeEvent *e, gpointer data) {
             continue;
 
         if (!avahi_dns_packet_append_record(p, pj->record, FALSE, 0)) {
-            g_warning("Bad probe size estimate!");
+            avahi_log_warn("Bad probe size estimate!");
 
             /* Unmark all following jobs */
             for (; pj; pj = pj->jobs_next)
@@ -343,7 +344,7 @@ static AvahiProbeJob* find_history_job(AvahiProbeScheduler *s, AvahiRecord *reco
 
 gboolean avahi_probe_scheduler_post(AvahiProbeScheduler *s, AvahiRecord *record, gboolean immediately) {
     AvahiProbeJob *pj;
-    GTimeVal tv;
+    struct timeval tv;
     
     g_assert(s);
     g_assert(record);
@@ -351,7 +352,7 @@ gboolean avahi_probe_scheduler_post(AvahiProbeScheduler *s, AvahiRecord *record,
 
     if ((pj = find_history_job(s, record)))
         return FALSE;
-    
+
     avahi_elapse_time(&tv, immediately ? 0 : AVAHI_PROBE_DEFER_MSEC, 0);
 
     if ((pj = find_scheduled_job(s, record))) {
@@ -370,7 +371,7 @@ gboolean avahi_probe_scheduler_post(AvahiProbeScheduler *s, AvahiRecord *record,
         pj->time_event = avahi_time_event_queue_add(s->time_event_queue, &pj->delivery, elapse_callback, pj);
 
         
-/*     g_message("Accepted new probe job."); */
+/*     avahi_log_debug("Accepted new probe job."); */
 
         return TRUE;
     }