1 files changed, 50 insertions, 61 deletions

diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index 64da5380e..a15e71f0d 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -1,19 +1,19 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2013, 2014, 2016 GNUnet e.V.
-
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This file is part of GNUnet
+   Copyright (C) 2013, 2014, 2016 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -53,7 +53,7 @@
 #ifdef __cplusplus
 extern "C"
 {
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -86,9 +86,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * may also specify the phone line that is used (typically zero).
  * The version is also right now always zero.
  */
-struct GNUNET_CONVERSATION_PhoneRecord
-{
-
+struct GNUNET_CONVERSATION_PhoneRecord {
   /**
    * Version of the phone record, for now always one.  We may
    * use other versions for anonymously hosted phone lines in
@@ -110,7 +108,6 @@ struct GNUNET_CONVERSATION_PhoneRecord
    * Phone line (CADET port) to connect to.
    */
   struct GNUNET_HashCode line_port;
-
 };
 
 GNUNET_NETWORK_STRUCT_END
@@ -118,8 +115,7 @@ GNUNET_NETWORK_STRUCT_END
 /**
  * Information about active callers to a phone.
  */
-enum GNUNET_CONVERSATION_PhoneEventCode
-{
+enum GNUNET_CONVERSATION_PhoneEventCode {
   /**
    * We are the callee and the phone is ringing.
    * We should accept the call or hang up.
@@ -131,7 +127,6 @@ enum GNUNET_CONVERSATION_PhoneEventCode
    * We must no longer use the caller's handle.
    */
   GNUNET_CONVERSATION_EC_PHONE_HUNG_UP
-
 };
 
 
@@ -155,9 +150,7 @@ typedef void
  * progresses from ring over ready to terminated.  Steps may
  * be skipped.
  */
-enum GNUNET_CONVERSATION_CallerEventCode
-{
-
+enum GNUNET_CONVERSATION_CallerEventCode {
   /**
    * We are the callee and the caller suspended the call.  Note that
    * both sides can independently suspend and resume calls; a call is
@@ -171,7 +164,6 @@ enum GNUNET_CONVERSATION_CallerEventCode
    * only "working" of both sides are active.
    */
   GNUNET_CONVERSATION_EC_CALLER_RESUME
-
 };
 
 
@@ -212,10 +204,10 @@ struct GNUNET_CONVERSATION_Phone;
  * @param event_handler_cls closure for @a event_handler
  */
 struct GNUNET_CONVERSATION_Phone *
-GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                  const struct GNUNET_IDENTITY_Ego *ego,
-                                  GNUNET_CONVERSATION_PhoneEventHandler event_handler,
-                                  void *event_handler_cls);
+GNUNET_CONVERSATION_phone_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                 const struct GNUNET_IDENTITY_Ego *ego,
+                                 GNUNET_CONVERSATION_PhoneEventHandler event_handler,
+                                 void *event_handler_cls);
 
 
 /**
@@ -227,8 +219,8 @@ GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param rd namestore record to fill in
  */
 void
-GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone,
-                                      struct GNUNET_GNSRECORD_Data *rd);
+GNUNET_CONVERSATION_phone_get_record(struct GNUNET_CONVERSATION_Phone *phone,
+                                     struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -242,11 +234,11 @@ GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone,
  * @param mic microphone to use
  */
 void
-GNUNET_CONVERSATION_caller_pick_up (struct GNUNET_CONVERSATION_Caller *caller,
-                                    GNUNET_CONVERSATION_CallerEventHandler event_handler,
-                                    void *event_handler_cls,
-                                    struct GNUNET_SPEAKER_Handle *speaker,
-                                    struct GNUNET_MICROPHONE_Handle *mic);
+GNUNET_CONVERSATION_caller_pick_up(struct GNUNET_CONVERSATION_Caller *caller,
+                                   GNUNET_CONVERSATION_CallerEventHandler event_handler,
+                                   void *event_handler_cls,
+                                   struct GNUNET_SPEAKER_Handle *speaker,
+                                   struct GNUNET_MICROPHONE_Handle *mic);
 
 
 /**
@@ -257,7 +249,7 @@ GNUNET_CONVERSATION_caller_pick_up (struct GNUNET_CONVERSATION_Caller *caller,
  * @param caller call to suspend
  */
 void
-GNUNET_CONVERSATION_caller_suspend (struct GNUNET_CONVERSATION_Caller *caller);
+GNUNET_CONVERSATION_caller_suspend(struct GNUNET_CONVERSATION_Caller *caller);
 
 
 /**
@@ -268,9 +260,9 @@ GNUNET_CONVERSATION_caller_suspend (struct GNUNET_CONVERSATION_Caller *caller);
  * @param mic microphone to use
  */
 void
-GNUNET_CONVERSATION_caller_resume (struct GNUNET_CONVERSATION_Caller *caller,
-                                   struct GNUNET_SPEAKER_Handle *speaker,
-                                   struct GNUNET_MICROPHONE_Handle *mic);
+GNUNET_CONVERSATION_caller_resume(struct GNUNET_CONVERSATION_Caller *caller,
+                                  struct GNUNET_SPEAKER_Handle *speaker,
+                                  struct GNUNET_MICROPHONE_Handle *mic);
 
 
 /**
@@ -280,7 +272,7 @@ GNUNET_CONVERSATION_caller_resume (struct GNUNET_CONVERSATION_Caller *caller,
  * @param caller who should we hang up on
  */
 void
-GNUNET_CONVERSATION_caller_hang_up (struct GNUNET_CONVERSATION_Caller *caller);
+GNUNET_CONVERSATION_caller_hang_up(struct GNUNET_CONVERSATION_Caller *caller);
 
 
 /**
@@ -289,7 +281,7 @@ GNUNET_CONVERSATION_caller_hang_up (struct GNUNET_CONVERSATION_Caller *caller);
  * @param phone phone to destroy
  */
 void
-GNUNET_CONVERSATION_phone_destroy (struct GNUNET_CONVERSATION_Phone *phone);
+GNUNET_CONVERSATION_phone_destroy(struct GNUNET_CONVERSATION_Phone *phone);
 
 
 /* *********************** CALL API ************************ */
@@ -303,9 +295,7 @@ struct GNUNET_CONVERSATION_Call;
 /**
  * Information about the current status of a call.
  */
-enum GNUNET_CONVERSATION_CallEventCode
-{
-
+enum GNUNET_CONVERSATION_CallEventCode {
   /**
    * We are the caller and are now ringing the other party (GNS lookup
    * succeeded).
@@ -354,7 +344,6 @@ enum GNUNET_CONVERSATION_CallEventCode
    * is restarted during a call.
    */
   GNUNET_CONVERSATION_EC_CALL_ERROR
-
 };
 
 
@@ -385,13 +374,13 @@ typedef void
  * @return handle for the call
  */
 struct GNUNET_CONVERSATION_Call *
-GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                struct GNUNET_IDENTITY_Ego *caller_id,
-                                const char *callee,
-                                struct GNUNET_SPEAKER_Handle *speaker,
-                                struct GNUNET_MICROPHONE_Handle *mic,
-                                GNUNET_CONVERSATION_CallEventHandler event_handler,
-                                void *event_handler_cls);
+GNUNET_CONVERSATION_call_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               struct GNUNET_IDENTITY_Ego *caller_id,
+                               const char *callee,
+                               struct GNUNET_SPEAKER_Handle *speaker,
+                               struct GNUNET_MICROPHONE_Handle *mic,
+                               GNUNET_CONVERSATION_CallEventHandler event_handler,
+                               void *event_handler_cls);
 
 
 /**
@@ -401,7 +390,7 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param call call to pause
  */
 void
-GNUNET_CONVERSATION_call_suspend (struct GNUNET_CONVERSATION_Call *call);
+GNUNET_CONVERSATION_call_suspend(struct GNUNET_CONVERSATION_Call *call);
 
 
 /**
@@ -412,9 +401,9 @@ GNUNET_CONVERSATION_call_suspend (struct GNUNET_CONVERSATION_Call *call);
  * @param mic microphone to use
  */
 void
-GNUNET_CONVERSATION_call_resume (struct GNUNET_CONVERSATION_Call *call,
-                                 struct GNUNET_SPEAKER_Handle *speaker,
-                                 struct GNUNET_MICROPHONE_Handle *mic);
+GNUNET_CONVERSATION_call_resume(struct GNUNET_CONVERSATION_Call *call,
+                                struct GNUNET_SPEAKER_Handle *speaker,
+                                struct GNUNET_MICROPHONE_Handle *mic);
 
 
 /**
@@ -423,10 +412,10 @@ GNUNET_CONVERSATION_call_resume (struct GNUNET_CONVERSATION_Call *call,
  * @param call call to terminate
  */
 void
-GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call);
+GNUNET_CONVERSATION_call_stop(struct GNUNET_CONVERSATION_Call *call);
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus