Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / revocation / revocation_api.c

diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index 0b9bc4ea64c6234d0b521e2f9d53e35842762c32..ef659baa0d609c63425d0e3424a169577b15fbe2 100644 (file)
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -91,7 +91,7 @@ handle_revocation_query_response (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Revocation query result: %d\n",
-              ntohl (qrm->is_valid));
+              (uint32_t) ntohl (qrm->is_valid));
   q->func (q->func_cls,
            ntohl (qrm->is_valid));
   GNUNET_REVOCATION_query_cancel (q);
@@ -113,19 +113,19 @@ GNUNET_REVOCATION_query (const struct GNUNET_CONFIGURATION_Handle *cfg,
                         GNUNET_REVOCATION_Callback func,
                          void *func_cls)
 {
-  GNUNET_MQ_hd_fixed_size (revocation_query_response,
-                           GNUNET_MESSAGE_TYPE_REVOCATION_QUERY_RESPONSE,
-                           struct QueryResponseMessage);
   struct GNUNET_REVOCATION_Query *q
     = GNUNET_new (struct GNUNET_REVOCATION_Query);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_revocation_query_response_handler (q),
+    GNUNET_MQ_hd_fixed_size (revocation_query_response,
+                             GNUNET_MESSAGE_TYPE_REVOCATION_QUERY_RESPONSE,
+                             struct QueryResponseMessage,
+                             q),
     GNUNET_MQ_handler_end ()
   };
   struct QueryMessage *qm;
   struct GNUNET_MQ_Envelope *env;
 
-  q->mq = GNUNET_CLIENT_connecT (cfg,
+  q->mq = GNUNET_CLIENT_connect (cfg,
                                  "revocation",
                                  handlers,
                                  &query_mq_error_handler,
@@ -225,7 +225,7 @@ handle_revocation_response (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Revocation transmission result: %d\n",
-              ntohl (rrm->is_valid));
+              (uint32_t) ntohl (rrm->is_valid));
   h->func (h->func_cls,
            ntohl (rrm->is_valid));
   GNUNET_REVOCATION_revoke_cancel (h);
@@ -255,13 +255,13 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
                          GNUNET_REVOCATION_Callback func,
                           void *func_cls)
 {
-  GNUNET_MQ_hd_fixed_size (revocation_response,
-                           GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE_RESPONSE,
-                           struct RevocationResponseMessage);
   struct GNUNET_REVOCATION_Handle *h
     = GNUNET_new (struct GNUNET_REVOCATION_Handle);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_revocation_response_handler (h),
+    GNUNET_MQ_hd_fixed_size (revocation_response,
+                             GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE_RESPONSE,
+                             struct RevocationResponseMessage,
+                             h),
     GNUNET_MQ_handler_end ()
   };
   unsigned long long matching_bits;
@@ -283,7 +283,7 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
     return NULL;
   }
 
-  h->mq = GNUNET_CLIENT_connecT (cfg,
+  h->mq = GNUNET_CLIENT_connect (cfg,
                                  "revocation",
                                  handlers,
                                  &revocation_mq_error_handler,