Merge pull request #103 from SilentSand/master

Licensing

1 files changed, 22 insertions, 35 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 042d5325..d58e895c 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -1,26 +1,25 @@
 /* Messenger.c
-*
-* An implementation of a simple text chat only messenger on the tox network core.
-*
- 
-    Copyright (C) 2013 Tox project All Rights Reserved.
-
-    This file is part of Tox.
-
-    Tox is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Tox 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Tox.  If not, see <http://www.gnu.org/licenses/>.
-    
-*/
+ *
+ * An implementation of a simple text chat only messenger on the tox network core.
+ *
+ *  Copyright (C) 2013 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *  
+ */
 
 #include "Messenger.h"
 #define MIN(a,b) (((a)<(b))?(a):(b))
@@ -39,8 +38,6 @@ typedef struct
     uint8_t userstatus_sent;
     uint16_t info_size; /* length of the info */
 }Friend;
- 
-
 
 uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];
 
@@ -58,7 +55,6 @@ static uint32_t numfriends;
    0 if we are offline
    static uint8_t online; */
 
-
 /* return the friend id associated to that public key.
    return -1 if no such friend */
 int getfriend_id(uint8_t * client_id)
@@ -77,7 +73,6 @@ int getfriend_id(uint8_t * client_id)
     return -1;
 }
 
-
 /* copies the public key associated to that friend id into client_id buffer.
    make sure that client_id is of size CLIENT_ID_SIZE.
    return 0 if success
@@ -97,7 +92,6 @@ int getclient_id(int friend_id, uint8_t * client_id)
     return -1;
 }
 
-
 /* add a friend
    set the data that will be sent along with friend request
    client_id is the client id of the friend
@@ -192,7 +186,6 @@ int m_delfriend(int friendnumber)
     return 0;
 }
 
-
 /* return 4 if friend is online
    return 3 if friend is confirmed
    return 2 if the friend request was sent
@@ -207,7 +200,6 @@ int m_friendstatus(int friendnumber)
     return friendlist[friendnumber].status;
 }
 
-
 /* send a text chat message to an online friend
    return 1 if packet was successfully put into the send queue
    return 0 if it was not */
@@ -240,7 +232,6 @@ static int m_sendname(int friendnumber, uint8_t * name)
 /* set the name of a friend
    return 0 if success
    return -1 if failure */
-
 static int setfriendname(int friendnumber, uint8_t * name)
 {
     if(friendnumber >= numfriends || friendnumber < 0)
@@ -251,7 +242,6 @@ static int setfriendname(int friendnumber, uint8_t * name)
     return 0;
 }
 
-
 /* Set our nickname
    name must be a string of maximum MAX_NAME_LENGTH length.
    return 0 if success
@@ -353,6 +343,7 @@ static int set_friend_userstatus(int friendnumber, uint8_t * status, uint16_t le
     friendlist[friendnumber].userstatus_length = length;
     return 0;
 }
+
 /*
 static void (*friend_request)(uint8_t *, uint8_t *, uint16_t);
 static uint8_t friend_request_isset = 0;
@@ -363,7 +354,6 @@ void m_callback_friendrequest(void (*function)(uint8_t *, uint8_t *, uint16_t))
     callback_friendrequest(function);
 }
 
-
 static void (*friend_message)(int, uint8_t *, uint16_t);
 static uint8_t friend_message_isset = 0;
 
@@ -374,7 +364,6 @@ void m_callback_friendmessage(void (*function)(int, uint8_t *, uint16_t))
     friend_message_isset = 1;
 }
 
-
 static void (*friend_namechange)(int, uint8_t *, uint16_t);
 static uint8_t friend_namechange_isset = 0;
 void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t))
@@ -521,8 +510,6 @@ static void doFriends()
     }
 }
 
-
-
 static void doInbound()
 {
     uint8_t secret_nonce[crypto_box_NONCEBYTES];