[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26916 - gnunet/src/set
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26916 - gnunet/src/set |
Date: |
Wed, 17 Apr 2013 12:53:41 +0200 |
Author: dold
Date: 2013-04-17 12:53:41 +0200 (Wed, 17 Apr 2013)
New Revision: 26916
Modified:
gnunet/src/set/mq.h
gnunet/src/set/set_api.c
Log:
fix
Modified: gnunet/src/set/mq.h
===================================================================
--- gnunet/src/set/mq.h 2013-04-17 10:47:29 UTC (rev 26915)
+++ gnunet/src/set/mq.h 2013-04-17 10:53:41 UTC (rev 26916)
@@ -100,22 +100,17 @@
void
GNUNET_MQ_notify_sent (struct GNUNET_MQ_Message *mqm,
- void (*)(void*),
+ GNUNET_MQ_NotifyCallback cb,
void *cls);
void
GNUNET_MQ_notify_timeout (struct GNUNET_MQ_Message *mqm,
- void (*)(void*),
+ GNUNET_MQ_NotifyCallback cb,
void *cls);
void
-GNUNET_MQ_notify_destroy (struct GNUNET_MQ_Message *mqm,
- void (*)(void*),
- void *cls);
-
-void
GNUNET_MQ_destroy (struct GNUNET_MQ_MessageQueue *mq);
#endif
Modified: gnunet/src/set/set_api.c
===================================================================
--- gnunet/src/set/set_api.c 2013-04-17 10:47:29 UTC (rev 26915)
+++ gnunet/src/set/set_api.c 2013-04-17 10:53:41 UTC (rev 26916)
@@ -244,24 +244,6 @@
/**
- * Destroy an operation handle
- *
- * @cls closure, the operation handle
- */
-static void
-operation_destroy (void *cls)
-{
- struct GNUNET_SET_OperationHandle *oh = cls;
- struct GNUNET_SET_OperationHandle *oh_assoc;
-
- oh_assoc = GNUNET_MQ_assoc_remove (oh->set->mq, oh->request_id);
- GNUNET_assert (oh_assoc == oh);
- oh->set = NULL;
- GNUNET_free (oh);
-}
-
-
-/**
* Signature of the main function of a task.
*
* @param cls closure
@@ -317,8 +299,6 @@
msg->app_id = *app_id;
memcpy (&msg[1], context_msg, htons (context_msg->size));
oh->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
operation_timeout_task, oh);
- /* destroy the operation if the queue gets destroyed */
- GNUNET_MQ_notify_destroy (mqm, operation_destroy, oh);
GNUNET_MQ_send (set->mq, mqm);
return oh;
@@ -417,8 +397,6 @@
mqm = GNUNET_MQ_msg (msg , GNUNET_MESSAGE_TYPE_SET_ACCEPT);
msg->request_id = htonl (request->request_id);
oh->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
operation_timeout_task, oh);
- /* destroy the operation if the queue gets destroyed */
- GNUNET_MQ_notify_destroy (mqm, operation_destroy, oh);
GNUNET_MQ_send (set->mq, mqm);
return oh;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26916 - gnunet/src/set,
gnunet <=