Passed everything through astyle.

1 files changed, 30 insertions, 26 deletions

diff --git a/core/Messenger.h b/core/Messenger.h
index e12b3fc8..cd9e6e63 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -76,7 +76,8 @@ typedef enum {
     USERSTATUS_AWAY,
     USERSTATUS_BUSY,
     USERSTATUS_INVALID
-} USERSTATUS;
+}
+USERSTATUS;
 
 typedef struct {
     uint8_t client_id[CLIENT_ID_SIZE];
@@ -111,22 +112,22 @@ typedef struct Messenger {
     Friend *friendlist;
     uint32_t numfriends;
 
-    void (*friend_message)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    void* friend_message_userdata;
-    void (*friend_action)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    void* friend_action_userdata;
-    void (*friend_namechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    void* friend_namechange_userdata;
-    void (*friend_statusmessagechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    void* friend_statusmessagechange_userdata;
-    void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS, void*);
-    void* friend_userstatuschange_userdata;
-    void (*read_receipt)(struct Messenger *m, int, uint32_t, void*);
-    void* read_receipt_userdata;
-    void (*friend_statuschange)(struct Messenger *m, int, uint8_t, void*);
-    void* friend_statuschange_userdata;
-    void (*friend_connectionstatuschange)(struct Messenger *m, int, uint8_t, void*);
-    void* friend_connectionstatuschange_userdata;
+    void (*friend_message)(struct Messenger *m, int, uint8_t *, uint16_t, void *);
+    void *friend_message_userdata;
+    void (*friend_action)(struct Messenger *m, int, uint8_t *, uint16_t, void *);
+    void *friend_action_userdata;
+    void (*friend_namechange)(struct Messenger *m, int, uint8_t *, uint16_t, void *);
+    void *friend_namechange_userdata;
+    void (*friend_statusmessagechange)(struct Messenger *m, int, uint8_t *, uint16_t, void *);
+    void *friend_statusmessagechange_userdata;
+    void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS, void *);
+    void *friend_userstatuschange_userdata;
+    void (*read_receipt)(struct Messenger *m, int, uint32_t, void *);
+    void *read_receipt_userdata;
+    void (*friend_statuschange)(struct Messenger *m, int, uint8_t, void *);
+    void *friend_statuschange_userdata;
+    void (*friend_connectionstatuschange)(struct Messenger *m, int, uint8_t, void *);
+    void *friend_connectionstatuschange_userdata;
 
 
 } Messenger;
@@ -255,29 +256,32 @@ void m_set_sends_receipts(Messenger *m, int friendnumber, int yesno);
 
 /* set the function that will be executed when a friend request is received.
     function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */
-void m_callback_friendrequest(Messenger *m, void (*function)(uint8_t *, uint8_t *, uint16_t, void*), void* userdata);
+void m_callback_friendrequest(Messenger *m, void (*function)(uint8_t *, uint8_t *, uint16_t, void *), void *userdata);
 
 /* set the function that will be executed when a message from a friend is received.
     function format is: function(int friendnumber, uint8_t * message, uint32_t length) */
-void m_callback_friendmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata);
+void m_callback_friendmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void *),
+                              void *userdata);
 
 /* set the function that will be executed when an action from a friend is received.
     function format is: function(int friendnumber, uint8_t * action, uint32_t length) */
-void m_callback_action(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata);
+void m_callback_action(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void *), void *userdata);
 
 /* set the callback for name changes
     function(int friendnumber, uint8_t *newname, uint16_t length)
     you are not responsible for freeing newname */
-void m_callback_namechange(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata);
+void m_callback_namechange(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void *),
+                           void *userdata);
 
 /* set the callback for status message changes
     function(int friendnumber, uint8_t *newstatus, uint16_t length)
     you are not responsible for freeing newstatus */
-void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata);
+void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void *),
+                              void *userdata);
 
 /* set the callback for status type changes
     function(int friendnumber, USERSTATUS kind) */
-void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USERSTATUS, void*), void* userdata);
+void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USERSTATUS, void *), void *userdata);
 
 /* set the callback for read receipts
     function(int friendnumber, uint32_t receipt)
@@ -286,7 +290,7 @@ void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USE
     has been received on the other side. since core doesn't
     track ids for you, receipt may not correspond to any message
     in that case, you should discard it. */
-void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, int, uint32_t, void*), void* userdata);
+void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, int, uint32_t, void *), void *userdata);
 
 /* set the callback for connection status changes
     function(int friendnumber, uint8_t status)
@@ -296,12 +300,12 @@ void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, int, u
     note that this callback is not called when adding friends, thus the "after
     being previously online" part. it's assumed that when adding friends,
     their connection status is offline. */
-void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, int, uint8_t, void*), void* userdata);
+void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, int, uint8_t, void *), void *userdata);
 
 /* run this at startup
  *  returns allocated instance of Messenger on success
  *  returns 0 if there are problems */
-Messenger * initMessenger(void);
+Messenger *initMessenger(void);
 
 /* run this before closing shop
  * free all datastructures */