-consistently use struct GNUNET_HashCode

6 files changed, 76 insertions, 76 deletions

diff --git a/src/chat/chat.c b/src/chat/chat.c
index 72c49a063..d7ebd79b8 100644
--- a/src/chat/chat.c
+++ b/src/chat/chat.c
@@ -92,7 +92,7 @@ struct MemberList
   /**
    * Member ID (pseudonym).
    */
-  GNUNET_HashCode id;
+  struct GNUNET_HashCode id;
 
 };
 
@@ -224,8 +224,8 @@ process_result (struct GNUNET_CHAT_Room *room,
   struct ReceiveNotificationMessage *received_msg;
   struct ConfirmationReceiptMessage *receipt;
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
-  GNUNET_HashCode id;
-  const GNUNET_HashCode *sender;
+  struct GNUNET_HashCode id;
+  const struct GNUNET_HashCode *sender;
   struct GNUNET_CONTAINER_MetaData *meta;
   struct GNUNET_CHAT_SendReceiptContext *src;
   struct MemberList *pos;
@@ -308,7 +308,7 @@ process_result (struct GNUNET_CHAT_Room *room,
     prev = NULL;
     pos = room->members;
     while ((NULL != pos) &&
-           (0 != memcmp (&pos->id, &id, sizeof (GNUNET_HashCode))))
+           (0 != memcmp (&pos->id, &id, sizeof (struct GNUNET_HashCode))))
     {
       prev = pos;
       pos = pos->next;
@@ -379,7 +379,7 @@ process_result (struct GNUNET_CHAT_Room *room,
       while ((NULL != pos) &&
              (0 !=
               memcmp (&pos->id, &received_msg->sender,
-                      sizeof (GNUNET_HashCode))))
+                      sizeof (struct GNUNET_HashCode))))
         pos = pos->next;
       GNUNET_assert (NULL != pos);
       sender = &received_msg->sender;
@@ -649,7 +649,7 @@ GNUNET_CHAT_join_room (const struct GNUNET_CONFIGURATION_Handle *cfg,
                        GNUNET_CHAT_MemberListCallback memberCallback,
                        void *member_cls,
                        GNUNET_CHAT_MessageConfirmation confirmationCallback,
-                       void *confirmation_cls, GNUNET_HashCode * me)
+                       void *confirmation_cls, struct GNUNET_HashCode * me)
 {
   struct GNUNET_CHAT_Room *chat_room;
   struct GNUNET_CRYPTO_RsaPrivateKey *priv_key;
@@ -755,7 +755,7 @@ transmit_send_request (void *cls, size_t size, void *buf)
       GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
   msg_to_send->reserved = htonl (0);
   if (NULL == smc->receiver)
-    memset (&msg_to_send->target, 0, sizeof (GNUNET_HashCode));
+    memset (&msg_to_send->target, 0, sizeof (struct GNUNET_HashCode));
   else
     GNUNET_CRYPTO_hash (smc->receiver,
                         sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
diff --git a/src/chat/chat.h b/src/chat/chat.h
index 5df7773a7..c65b75de9 100644
--- a/src/chat/chat.h
+++ b/src/chat/chat.h
@@ -80,7 +80,7 @@ struct ReceiveNotificationMessage
    * Hash of the public key of the pseudonym of the sender of the message.
    * Should be all zeros for anonymous.
    */
-  GNUNET_HashCode sender;
+  struct GNUNET_HashCode sender;
 
   /**
    * The encrypted session key.
@@ -136,7 +136,7 @@ struct TransmitRequestMessage
   /**
    * Who should receive this message?  Set to all zeros for "everyone".
    */
-  GNUNET_HashCode target;
+  struct GNUNET_HashCode target;
 
 };
 
@@ -189,17 +189,17 @@ struct ConfirmationReceiptMessage
   /**
    * Who is confirming the receipt?
    */
-  GNUNET_HashCode target;
+  struct GNUNET_HashCode target;
 
   /**
    * Who is the author of the chat message?
    */
-  GNUNET_HashCode author;
+  struct GNUNET_HashCode author;
 
   /**
    * Hash of the (possibly encrypted) content.
    */
-  GNUNET_HashCode content;
+  struct GNUNET_HashCode content;
 
 };
 
@@ -406,12 +406,12 @@ struct P2PReceiveNotificationMessage
    * Hash of the public key of the pseudonym of the sender of the message
    * Should be all zeros for anonymous.
    */
-  GNUNET_HashCode sender;
+  struct GNUNET_HashCode sender;
 
   /**
    * Who should receive this message?  Set to all zeros for "everyone".
    */
-  GNUNET_HashCode target;
+  struct GNUNET_HashCode target;
 
   /**
    * The encrypted session key.
@@ -465,17 +465,17 @@ struct P2PConfirmationReceiptMessage
   /**
    * Who is confirming the receipt?
    */
-  GNUNET_HashCode target;
+  struct GNUNET_HashCode target;
 
   /**
    * Who is the author of the chat message?
    */
-  GNUNET_HashCode author;
+  struct GNUNET_HashCode author;
 
   /**
    * Hash of the (possibly encrypted) content.
    */
-  GNUNET_HashCode content;
+  struct GNUNET_HashCode content;
 
 };
 GNUNET_NETWORK_STRUCT_END
diff --git a/src/chat/gnunet-chat.c b/src/chat/gnunet-chat.c
index 012f78ed9..d41d59062 100644
--- a/src/chat/gnunet-chat.c
+++ b/src/chat/gnunet-chat.c
@@ -110,7 +110,7 @@ join_cb (void *cls)
  */
 static int
 receive_cb (void *cls, struct GNUNET_CHAT_Room *room,
-            const GNUNET_HashCode * sender,
+            const struct GNUNET_HashCode * sender,
             const struct GNUNET_CONTAINER_MetaData *member_info,
             const char *message, struct GNUNET_TIME_Absolute timestamp,
             enum GNUNET_CHAT_MsgOptions options)
@@ -199,7 +199,7 @@ static int
 confirmation_cb (void *cls, struct GNUNET_CHAT_Room *room,
                  uint32_t orig_seq_number,
                  struct GNUNET_TIME_Absolute timestamp,
-                 const GNUNET_HashCode * receiver)
+                 const struct GNUNET_HashCode * receiver)
 {
   char *nick;
   char *unique_nick;
@@ -238,7 +238,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
   char *nick;
   char *non_unique_nick;
   int nick_is_a_dup;
-  GNUNET_HashCode id;
+  struct GNUNET_HashCode id;
   struct UserList *pos;
   struct UserList *prev;
 
@@ -304,7 +304,7 @@ do_join (const char *arg, const void *xtra)
 {
   char *my_name;
   int my_name_is_a_dup;
-  GNUNET_HashCode me;
+  struct GNUNET_HashCode me;
 
   if (arg[0] == '#')
     arg++;                      /* ignore first hash */
@@ -343,7 +343,7 @@ do_nick (const char *msg, const void *xtra)
 {
   char *my_name;
   int my_name_is_a_dup;
-  GNUNET_HashCode me;
+  struct GNUNET_HashCode me;
 
   GNUNET_CHAT_leave_room (room);
   free_user_list ();
@@ -383,7 +383,7 @@ do_names (const char *msg, const void *xtra)
   char *unique_name;
   int name_is_a_dup;
   struct UserList *pos;
-  GNUNET_HashCode pid;
+  struct GNUNET_HashCode pid;
 
   FPRINTF (stdout, _("Users in room `%s': "), room_name);
   pos = users;
@@ -424,8 +424,8 @@ static int
 do_send_pm (const char *msg, const void *xtra)
 {
   char *user;
-  GNUNET_HashCode uid;
-  GNUNET_HashCode pid;
+  struct GNUNET_HashCode uid;
+  struct GNUNET_HashCode pid;
   uint32_t seq;
   struct UserList *pos;
 
@@ -451,7 +451,7 @@ do_send_pm (const char *msg, const void *xtra)
     GNUNET_CRYPTO_hash (&pos->pkey,
                         sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
                         &pid);
-    if (0 == memcmp (&pid, &uid, sizeof (GNUNET_HashCode)))
+    if (0 == memcmp (&pid, &uid, sizeof (struct GNUNET_HashCode)))
       break;
     pos = pos->next;
   }
@@ -661,7 +661,7 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  GNUNET_HashCode me;
+  struct GNUNET_HashCode me;
   char *my_name;
   int my_name_is_a_dup;
 
diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c
index 3405659a9..a20c8cf32 100644
--- a/src/chat/gnunet-service-chat.c
+++ b/src/chat/gnunet-service-chat.c
@@ -69,7 +69,7 @@ struct ChatClient
   /**
    * Hash of the public key (for convenience).
    */
-  GNUNET_HashCode id;
+  struct GNUNET_HashCode id;
 
   /**
    * Options which the client is willing to receive.
@@ -117,7 +117,7 @@ struct AnonymousMessage
   /**
    * Hash of the message.
    */
-  GNUNET_HashCode hash;
+  struct GNUNET_HashCode hash;
 
 };
 
@@ -162,7 +162,7 @@ static void
 remember_anonymous_message (const struct P2PReceiveNotificationMessage
                             *p2p_rnmsg)
 {
-  static GNUNET_HashCode hash;
+  static struct GNUNET_HashCode hash;
   struct AnonymousMessage *anon_msg;
   struct AnonymousMessage *prev;
   int anon_list_len;
@@ -192,13 +192,13 @@ remember_anonymous_message (const struct P2PReceiveNotificationMessage
 static int
 lookup_anonymous_message (const struct P2PReceiveNotificationMessage *p2p_rnmsg)
 {
-  static GNUNET_HashCode hash;
+  static struct GNUNET_HashCode hash;
   struct AnonymousMessage *anon_msg;
 
   GNUNET_CRYPTO_hash (p2p_rnmsg, ntohs (p2p_rnmsg->header.size), &hash);
   anon_msg = anonymous_list_head;
   while ((NULL != anon_msg) &&
-         (0 != memcmp (&anon_msg->hash, &hash, sizeof (GNUNET_HashCode))))
+         (0 != memcmp (&anon_msg->hash, &hash, sizeof (struct GNUNET_HashCode))))
     anon_msg = anon_msg->next;
   return (NULL != anon_msg);
 }
@@ -244,7 +244,7 @@ transmit_message_notification_to_peer (void *cls, size_t size, void *buf)
  * Ask to send a message notification to the peer.
  */
 static int
-send_message_noficiation (void *cls, const GNUNET_HashCode * key, void *value)
+send_message_noficiation (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct P2PReceiveNotificationMessage *msg = cls;
   struct ConnectedPeer *cp = value;
@@ -280,7 +280,7 @@ static void
 handle_transmit_request (void *cls, struct GNUNET_SERVER_Client *client,
                          const struct GNUNET_MessageHeader *message)
 {
-  static GNUNET_HashCode all_zeros;
+  static struct GNUNET_HashCode all_zeros;
   const struct TransmitRequestMessage *trmsg;
   struct ReceiveNotificationMessage *rnmsg;
   struct P2PReceiveNotificationMessage *p2p_rnmsg;
@@ -349,7 +349,7 @@ handle_transmit_request (void *cls, struct GNUNET_SERVER_Client *client,
   is_anon = (0 != (ntohl (trmsg->msg_options) & GNUNET_CHAT_MSG_ANONYMOUS));
   if (is_anon)
   {
-    memset (&rnmsg->sender, 0, sizeof (GNUNET_HashCode));
+    memset (&rnmsg->sender, 0, sizeof (struct GNUNET_HashCode));
     rnmsg->sequence_number = 0;
   }
   else
@@ -364,7 +364,7 @@ handle_transmit_request (void *cls, struct GNUNET_SERVER_Client *client,
                 "Encrypting the session key using the public key of '%s'\n",
                 GNUNET_h2s (&trmsg->target));
 #endif
-    if (0 == memcmp (&all_zeros, &trmsg->target, sizeof (GNUNET_HashCode)))
+    if (0 == memcmp (&all_zeros, &trmsg->target, sizeof (struct GNUNET_HashCode)))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Malformed message: private, but no target\n");
@@ -377,7 +377,7 @@ handle_transmit_request (void *cls, struct GNUNET_SERVER_Client *client,
     target = client_list_head;
     while ((NULL != target) &&
            (0 !=
-            memcmp (&target->id, &trmsg->target, sizeof (GNUNET_HashCode))))
+            memcmp (&target->id, &trmsg->target, sizeof (struct GNUNET_HashCode))))
       target = target->next;
     if (NULL == target)
     {
@@ -416,7 +416,7 @@ handle_transmit_request (void *cls, struct GNUNET_SERVER_Client *client,
         (pos->client != client))
     {
       if (((!is_priv) ||
-           (0 == memcmp (&trmsg->target, &pos->id, sizeof (GNUNET_HashCode))))
+           (0 == memcmp (&trmsg->target, &pos->id, sizeof (struct GNUNET_HashCode))))
           && (0 == (ntohl (trmsg->msg_options) & (~pos->msg_options))))
       {
         GNUNET_SERVER_notification_context_unicast (nc, pos->client,
@@ -521,7 +521,7 @@ transmit_join_notification_to_peer (void *cls, size_t size, void *buf)
  * Ask to send a join notification to the peer.
  */
 static int
-send_join_noficiation (void *cls, const GNUNET_HashCode * key, void *value)
+send_join_noficiation (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct ChatClient *entry = cls;
   struct ConnectedPeer *cp = value;
@@ -703,7 +703,7 @@ transmit_confirmation_receipt_to_peer (void *cls, size_t size, void *buf)
  * Ask to send a confirmation receipt to the peer.
  */
 static int
-send_confirmation_receipt (void *cls, const GNUNET_HashCode * key, void *value)
+send_confirmation_receipt (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct P2PConfirmationReceiptMessage *receipt = cls;
   struct ConnectedPeer *cp = value;
@@ -754,7 +754,7 @@ handle_acknowledge_request (void *cls, struct GNUNET_SERVER_Client *client,
   author = client_list_head;
   while ((NULL != author) &&
          (0 !=
-          memcmp (&receipt->author, &author->id, sizeof (GNUNET_HashCode))))
+          memcmp (&receipt->author, &author->id, sizeof (struct GNUNET_HashCode))))
     author = author->next;
   if (NULL == author)
   {
@@ -767,7 +767,7 @@ handle_acknowledge_request (void *cls, struct GNUNET_SERVER_Client *client,
   target = client_list_head;
   while ((NULL != target) &&
          (0 !=
-          memcmp (&receipt->target, &target->id, sizeof (GNUNET_HashCode))))
+          memcmp (&receipt->target, &target->id, sizeof (struct GNUNET_HashCode))))
     target = target->next;
   if (NULL == target)
   {
@@ -880,7 +880,7 @@ transmit_leave_notification_to_peer (void *cls, size_t size, void *buf)
  * Ask to send a leave notification to the peer.
  */
 static int
-send_leave_noficiation (void *cls, const GNUNET_HashCode * key, void *value)
+send_leave_noficiation (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct ChatClient *entry = cls;
   struct ConnectedPeer *cp = value;
@@ -1000,7 +1000,7 @@ handle_p2p_join_notification (void *cls,
   struct ChatClient *new_entry;
   struct ChatClient *entry;
   struct JoinNotificationMessage *jnmsg;
-  GNUNET_HashCode id;
+  struct GNUNET_HashCode id;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got P2P join notification\n");
   if (ntohs (message->size) <= sizeof (struct P2PJoinNotificationMessage))
@@ -1025,7 +1025,7 @@ handle_p2p_join_notification (void *cls,
   entry = client_list_head;
   while (NULL != entry)
   {
-    if (0 == memcmp (&entry->id, &id, sizeof (GNUNET_HashCode)))
+    if (0 == memcmp (&entry->id, &id, sizeof (struct GNUNET_HashCode)))
     {
 #if DEBUG_CHAT_SERVICE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1109,7 +1109,7 @@ handle_p2p_leave_notification (void *cls,
                                unsigned int atsi_count)
 {
   const struct P2PLeaveNotificationMessage *p2p_lnmsg;
-  GNUNET_HashCode id;
+  struct GNUNET_HashCode id;
   struct ChatClient *pos;
   struct ChatClient *prev;
   struct ChatClient *entry;
@@ -1124,7 +1124,7 @@ handle_p2p_leave_notification (void *cls,
   prev = NULL;
   while (NULL != pos)
   {
-    if (0 == memcmp (&pos->id, &id, sizeof (GNUNET_HashCode)))
+    if (0 == memcmp (&pos->id, &id, sizeof (struct GNUNET_HashCode)))
       break;
     prev = pos;
     pos = pos->next;
@@ -1195,7 +1195,7 @@ handle_p2p_message_notification (void *cls,
   struct ReceiveNotificationMessage *rnmsg;
   struct ChatClient *sender;
   struct ChatClient *pos;
-  static GNUNET_HashCode all_zeros;
+  static struct GNUNET_HashCode all_zeros;
   int is_priv;
   int is_anon;
   uint16_t msg_len;
@@ -1246,7 +1246,7 @@ handle_p2p_message_notification (void *cls,
     sender = client_list_head;
     while ((NULL != sender) &&
            (0 !=
-            memcmp (&sender->id, &p2p_rnmsg->sender, sizeof (GNUNET_HashCode))))
+            memcmp (&sender->id, &p2p_rnmsg->sender, sizeof (struct GNUNET_HashCode))))
       sender = sender->next;
     if (NULL == sender)
     {
@@ -1287,7 +1287,7 @@ handle_p2p_message_notification (void *cls,
   rnmsg->reserved = htonl (0);
   rnmsg->timestamp = p2p_rnmsg->timestamp;
   is_priv =
-      (0 != memcmp (&all_zeros, &p2p_rnmsg->target, sizeof (GNUNET_HashCode)));
+      (0 != memcmp (&all_zeros, &p2p_rnmsg->target, sizeof (struct GNUNET_HashCode)));
   if (is_priv)
     memcpy (&rnmsg->encrypted_key, &p2p_rnmsg->encrypted_key,
             sizeof (struct GNUNET_CRYPTO_RsaEncryptedData));
@@ -1300,7 +1300,7 @@ handle_p2p_message_notification (void *cls,
     {
       if (((!is_priv) ||
            (0 ==
-            memcmp (&p2p_rnmsg->target, &pos->id, sizeof (GNUNET_HashCode)))) &&
+            memcmp (&p2p_rnmsg->target, &pos->id, sizeof (struct GNUNET_HashCode)))) &&
           (0 == (ntohl (p2p_rnmsg->msg_options) & (~pos->msg_options))))
       {
         GNUNET_SERVER_notification_context_unicast (nc, pos->client,
@@ -1396,7 +1396,7 @@ handle_p2p_confirmation_receipt (void *cls,
   target = client_list_head;
   while ((NULL != target) &&
          (0 !=
-          memcmp (&target->id, &p2p_crmsg->target, sizeof (GNUNET_HashCode))))
+          memcmp (&target->id, &p2p_crmsg->target, sizeof (struct GNUNET_HashCode))))
     target = target->next;
   if (NULL == target)
   {
@@ -1420,7 +1420,7 @@ handle_p2p_confirmation_receipt (void *cls,
   author = client_list_head;
   while ((NULL != author) &&
          (0 !=
-          memcmp (&author->id, &p2p_crmsg->author, sizeof (GNUNET_HashCode))))
+          memcmp (&author->id, &p2p_crmsg->author, sizeof (struct GNUNET_HashCode))))
     author = author->next;
   if (NULL == author)
   {
@@ -1563,7 +1563,7 @@ peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
  * @return GNUNET_YES (we should continue to iterate)
  */
 static int
-clean_peer (void *cls, const GNUNET_HashCode * key, void *value)
+clean_peer (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct ConnectedPeer *cp;
   const struct GNUNET_PeerIdentity *peer =
@@ -1595,7 +1595,7 @@ peer_disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
     return;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Peer disconnected: %s\n",
               GNUNET_i2s (peer));
-  clean_peer (NULL, (const GNUNET_HashCode *) peer, NULL);
+  clean_peer (NULL, (const struct GNUNET_HashCode *) peer, NULL);
 }
 
 
diff --git a/src/chat/test_chat.c b/src/chat/test_chat.c
index 2e8272def..370cb04ee 100644
--- a/src/chat/test_chat.c
+++ b/src/chat/test_chat.c
@@ -58,7 +58,7 @@ struct Wanted
 {
   struct GNUNET_CONTAINER_MetaData *meta;
 
-  GNUNET_HashCode *sender;
+  struct GNUNET_HashCode *sender;
 
   char *msg;
 
@@ -80,9 +80,9 @@ static struct PeerContext p1;
 
 static struct PeerContext p2;
 
-static GNUNET_HashCode alice;
+static struct GNUNET_HashCode alice;
 
-static GNUNET_HashCode bob;
+static struct GNUNET_HashCode bob;
 
 static struct GNUNET_CHAT_Room *alice_room;
 
@@ -201,7 +201,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
                 enum GNUNET_CHAT_MsgOptions options)
 {
   struct Wanted *want = cls;
-  GNUNET_HashCode sender;
+  struct GNUNET_HashCode sender;
 
 #if VERBOSE
   printf ("%s - told that %s has %s\n", want->me,
@@ -213,7 +213,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
   GNUNET_CRYPTO_hash (member_id,
                       sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
                       &sender);
-  if ((0 == memcmp (&sender, want->sender, sizeof (GNUNET_HashCode))) &&
+  if ((0 == memcmp (&sender, want->sender, sizeof (struct GNUNET_HashCode))) &&
       (((member_info == NULL) && (want->meta == NULL)) ||
        ((member_info != NULL) && (want->meta != NULL) &&
         (GNUNET_CONTAINER_meta_data_test_equal (member_info, want->meta)))) &&
@@ -234,7 +234,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
 
 static int
 receive_cb (void *cls, struct GNUNET_CHAT_Room *room,
-            const GNUNET_HashCode * sender,
+            const struct GNUNET_HashCode * sender,
             const struct GNUNET_CONTAINER_MetaData *meta, const char *message,
             struct GNUNET_TIME_Absolute timestamp,
             enum GNUNET_CHAT_MsgOptions options)
@@ -250,7 +250,7 @@ receive_cb (void *cls, struct GNUNET_CHAT_Room *room,
   if ((0 == strcmp (message, want->msg)) &&
       (((sender == NULL) && (want->sender == NULL)) ||
        ((sender != NULL) && (want->sender != NULL) &&
-        (0 == memcmp (sender, want->sender, sizeof (GNUNET_HashCode))))) &&
+        (0 == memcmp (sender, want->sender, sizeof (struct GNUNET_HashCode))))) &&
       (GNUNET_CONTAINER_meta_data_test_equal (meta, want->meta)) &&
       (options == want->opt) &&
       /* Not == since the library sets the actual timestamp, so it may be
@@ -275,7 +275,7 @@ static int
 confirmation_cb (void *cls, struct GNUNET_CHAT_Room *room,
                  uint32_t orig_seq_number,
                  struct GNUNET_TIME_Absolute timestamp,
-                 const GNUNET_HashCode * receiver)
+                 const struct GNUNET_HashCode * receiver)
 {
   struct Wanted *want = cls;
 
@@ -285,7 +285,7 @@ confirmation_cb (void *cls, struct GNUNET_CHAT_Room *room,
                                                   EXTRACTOR_METATYPE_TITLE),
           orig_seq_number);
 #endif
-  if ((0 == memcmp (receiver, want->sender, sizeof (GNUNET_HashCode))) &&
+  if ((0 == memcmp (receiver, want->sender, sizeof (struct GNUNET_HashCode))) &&
       (orig_seq_number == want->sequence_number) &&
       (timestamp.abs_value >= want->timestamp.abs_value))
   {
diff --git a/src/chat/test_chat_private.c b/src/chat/test_chat_private.c
index 8b61392ca..0aebd8f8b 100644
--- a/src/chat/test_chat_private.c
+++ b/src/chat/test_chat_private.c
@@ -56,7 +56,7 @@ struct Wanted
 {
   struct GNUNET_CONTAINER_MetaData *meta;
 
-  GNUNET_HashCode *sender;
+  struct GNUNET_HashCode *sender;
 
   /**
    * Alternative meta/sender is used when we expect join/leave notification
@@ -64,7 +64,7 @@ struct Wanted
    */
   struct GNUNET_CONTAINER_MetaData *meta2;
 
-  GNUNET_HashCode *sender2;
+  struct GNUNET_HashCode *sender2;
 
   char *msg;
 
@@ -86,11 +86,11 @@ static struct PeerContext p2;
 
 static struct PeerContext p3;
 
-static GNUNET_HashCode alice;
+static struct GNUNET_HashCode alice;
 
-static GNUNET_HashCode bob;
+static struct GNUNET_HashCode bob;
 
-static GNUNET_HashCode carol;
+static struct GNUNET_HashCode carol;
 
 static struct GNUNET_CHAT_Room *alice_room;
 
@@ -220,7 +220,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
                 enum GNUNET_CHAT_MsgOptions options)
 {
   struct Wanted *want = cls;
-  GNUNET_HashCode sender;
+  struct GNUNET_HashCode sender;
 
 #if VERBOSE
   printf ("%s - told that %s has %s\n", want->me,
@@ -233,9 +233,9 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
                       sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
                       &sender);
   /* entertain both primary and an alternative sender/meta */
-  if (((0 == memcmp (&sender, want->sender, sizeof (GNUNET_HashCode))) ||
+  if (((0 == memcmp (&sender, want->sender, sizeof (struct GNUNET_HashCode))) ||
        ((want->sender2 != NULL) &&
-        (0 == memcmp (&sender, want->sender2, sizeof (GNUNET_HashCode))))) &&
+        (0 == memcmp (&sender, want->sender2, sizeof (struct GNUNET_HashCode))))) &&
       (((member_info == NULL) && (want->meta == NULL)) ||
        ((member_info != NULL) &&
         (((want->meta != NULL) &&
@@ -246,7 +246,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
   {
     /* remember Bob's public key, we need it to send private message */
     if (NULL == bob_public_key &&
-        (0 == memcmp (&bob, want->sender, sizeof (GNUNET_HashCode))))
+        (0 == memcmp (&bob, want->sender, sizeof (struct GNUNET_HashCode))))
       bob_public_key =
           GNUNET_memdup (member_id,
                          sizeof (struct
@@ -254,7 +254,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
     if (want->sender2 != NULL)
     {
       /* flush alternative sender */
-      if (0 == memcmp (&sender, want->sender, sizeof (GNUNET_HashCode)))
+      if (0 == memcmp (&sender, want->sender, sizeof (struct GNUNET_HashCode)))
       {
         want->sender = want->sender2;
         want->meta = want->meta2;
@@ -277,7 +277,7 @@ member_list_cb (void *cls, const struct GNUNET_CONTAINER_MetaData *member_info,
 
 static int
 receive_cb (void *cls, struct GNUNET_CHAT_Room *room,
-            const GNUNET_HashCode * sender,
+            const struct GNUNET_HashCode * sender,
             const struct GNUNET_CONTAINER_MetaData *meta, const char *message,
             struct GNUNET_TIME_Absolute timestamp,
             enum GNUNET_CHAT_MsgOptions options)
@@ -294,7 +294,7 @@ receive_cb (void *cls, struct GNUNET_CHAT_Room *room,
   if ((want->msg != NULL) && (0 == strcmp (message, want->msg)) &&
       (((sender == NULL) && (want->sender == NULL)) ||
        ((sender != NULL) && (want->sender != NULL) &&
-        (0 == memcmp (sender, want->sender, sizeof (GNUNET_HashCode))))) &&
+        (0 == memcmp (sender, want->sender, sizeof (struct GNUNET_HashCode))))) &&
       (GNUNET_CONTAINER_meta_data_test_equal (meta, want->meta)) &&
       (options == want->opt) &&
       /* Not == since the library sets the actual timestamp, so it may be