convert statistics service to new service MQ API

2 files changed, 4 insertions, 0 deletions

diff --git a/src/util/mq.c b/src/util/mq.c
index e69d1c483..61b5471e1 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -1046,7 +1046,10 @@ GNUNET_MQ_destroy (struct GNUNET_MQ_Handle *mq)
   }
   GNUNET_assert (0 == mq->queue_length);
   while (NULL != (dnh = mq->dnh_head))
+  {
     dnh->cb (dnh->cb_cls);
+    GNUNET_MQ_destroy_notify_cancel (dnh);
+  }
   if (NULL != mq->assoc_map)
   {
     GNUNET_CONTAINER_multihashmap32_destroy (mq->assoc_map);
diff --git a/src/util/service_new.c b/src/util/service_new.c
index fe8e79f17..123b40d5b 100644
--- a/src/util/service_new.c
+++ b/src/util/service_new.c
@@ -1954,6 +1954,7 @@ service_client_mst_cb (void *cls,
   client->needs_continue = GNUNET_YES;
   client->warn_type = ntohs (message->type);
   client->warn_start = GNUNET_TIME_absolute_get ();
+  GNUNET_assert (NULL == client->warn_task);
   client->warn_task
     = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
                                     &warn_no_client_continue,