/*
This file is part of GNUnet.
- (C) 2012-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUNET_MQ_NotifyCallback sent_cb;
/**
- * Closure for send_cb
+ * Closure for @e send_cb
*/
void *sent_cls;
};
/**
* Task scheduled during #GNUNET_MQ_impl_send_continue.
*/
- GNUNET_SCHEDULER_TaskIdentifier continue_task;
+ struct GNUNET_SCHEDULER_Task * continue_task;
/**
- * Next id that should be used for the assoc_map,
+ * Next id that should be used for the @e assoc_map,
* initialized lazily to a random value together with
- * assoc_map
+ * @e assoc_map
*/
uint32_t assoc_id;
};
const struct GNUNET_MQ_MessageHandler *handler;
int handled = GNUNET_NO;
- handler = mq->handlers;
- if (NULL == handler)
+ if (NULL == mq->handlers)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
"No handler for message of type %d\n",
ntohs (mh->type));
return;
}
- for (; NULL != handler->cb; handler++)
+ for (handler = mq->handlers; NULL != handler->cb; handler++)
{
if (handler->type == ntohs (mh->type))
{
handler->cb (mq->handlers_cls, mh);
handled = GNUNET_YES;
+ break;
}
}
-
if (GNUNET_NO == handled)
LOG (GNUNET_ERROR_TYPE_WARNING,
"No handler for message of type %d\n",
struct GNUNET_MQ_Handle *mq = cls;
struct GNUNET_MQ_Envelope *current_envelope;
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- mq->continue_task = GNUNET_SCHEDULER_NO_TASK;
+ mq->continue_task = NULL;
/* call is only valid if we're actually currently sending
* a message */
current_envelope = mq->current_envelope;
void
GNUNET_MQ_impl_send_continue (struct GNUNET_MQ_Handle *mq)
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == mq->continue_task);
+ GNUNET_assert (NULL == mq->continue_task);
mq->continue_task = GNUNET_SCHEDULER_add_now (&impl_send_continue,
mq);
}
GNUNET_MQ_impl_current (struct GNUNET_MQ_Handle *mq)
{
if (NULL == mq->current_envelope)
- GNUNET_abort ();
+ GNUNET_assert (0);
if (NULL == mq->current_envelope->mh)
- GNUNET_abort ();
+ GNUNET_assert (0);
return mq->current_envelope->mh;
}
{
mq->destroy_impl (mq, mq->impl_state);
}
- if (GNUNET_SCHEDULER_NO_TASK != mq->continue_task)
+ if (NULL != mq->continue_task)
{
GNUNET_SCHEDULER_cancel (mq->continue_task);
- mq->continue_task = GNUNET_SCHEDULER_NO_TASK;
+ mq->continue_task = NULL;
}
while (NULL != mq->envelope_head)
{