-simplifying core API (#2400)

[oweals/gnunet.git] / src / chat / chat.c

diff --git a/src/chat/chat.c b/src/chat/chat.c
index 74dde678c6b59bd6ea09ad669fd09033150434ee..72c49a063a86f89137ae5c975154f8dcee38fd40 100644 (file)
--- a/src/chat/chat.c
+++ b/src/chat/chat.c
@@ -32,7 +32,7 @@
 #include "gnunet_signatures.h"
 #include "chat.h"
 
-#define DEBUG_CHAT GNUNET_NO
+#define DEBUG_CHAT GNUNET_EXTRA_LOGGING
 #define NICK_IDENTITY_PREFIX ".chat_identity_"
 
 
@@ -148,7 +148,8 @@ struct GNUNET_CHAT_SendReceiptContext
 /**
  * Ask client to send a join request.
  */
-static int rejoin_room (struct GNUNET_CHAT_Room *chat_room);
+static int
+rejoin_room (struct GNUNET_CHAT_Room *chat_room);
 
 
 /**
@@ -404,9 +405,8 @@ process_result (struct GNUNET_CHAT_Room *room,
     if (NULL != room->confirmation_callback)
       room->confirmation_callback (room->confirmation_cls, room,
                                    ntohl (receipt->sequence_number),
-                                   GNUNET_TIME_absolute_ntoh (receipt->
-                                                              timestamp),
-                                   &receipt->target);
+                                   GNUNET_TIME_absolute_ntoh
+                                   (receipt->timestamp), &receipt->target);
     break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Unknown message type: '%u'\n"),
@@ -599,7 +599,7 @@ GNUNET_CHAT_leave_room (struct GNUNET_CHAT_Room *chat_room)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Leaving the room '%s'\n",
               chat_room->room_name);
 #endif
-  GNUNET_CLIENT_disconnect (chat_room->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (chat_room->client);
   GNUNET_free (chat_room->room_name);
   GNUNET_CONTAINER_meta_data_destroy (chat_room->member_info);
   GNUNET_CRYPTO_rsa_key_free (chat_room->my_private_key);
@@ -626,7 +626,7 @@ GNUNET_CHAT_leave_room (struct GNUNET_CHAT_Room *chat_room)
  * @param room_name name of the room
  * @param msg_options message options of the joining user
  * @param joinCallback function to call on successful join
- * @param join_cls closure for joinCallback 
+ * @param join_cls closure for joinCallback
  * @param messageCallback which function to call if a message has
  *        been received?
  * @param message_cls argument to callback