1 files changed, 10 insertions, 12 deletions

diff --git a/toxav/msi.c b/toxav/msi.c
index c2d50302..aab13471 100755
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -28,8 +28,6 @@
 
 #include "../toxcore/logger.h"
 
-/*#define _BSD_SOURCE*/
-
 #include "msi.h"
 #include "event.h"
 
@@ -219,7 +217,7 @@ static inline__ const uint8_t *stringify_response ( MSIResponse response )
  * @param msg Container.
  * @param data The data.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int parse_raw_data ( MSIMessage *msg, const uint8_t *data, uint16_t length )
@@ -354,7 +352,7 @@ void free_message ( MSIMessage *msg )
  * @param type Request or response.
  * @param type_id Type of request/response.
  * @return MSIMessage* Created message.
- * @retval NULL Error occured.
+ * @retval NULL Error occurred.
  */
 MSIMessage *msi_new_message ( uint8_t type, const uint8_t *type_id )
 {
@@ -387,7 +385,7 @@ MSIMessage *msi_new_message ( uint8_t type, const uint8_t *type_id )
  *
  * @param data The data.
  * @return MSIMessage* Parsed message.
- * @retval NULL Error occured.
+ * @retval NULL Error occurred.
  */
 MSIMessage *parse_message ( const uint8_t *data, uint16_t length )
 {
@@ -495,7 +493,7 @@ uint8_t *append_header_to_string (
 
     *dest = field_byte; /* Set the first byte */
 
-    uint8_t *_getback_byte = dest + 1; /* remeber the byte we were on */
+    uint8_t *_getback_byte = dest + 1; /* remember the byte we were on */
     dest += 3; /* swith to 4th byte where field value starts */
 
     /* Now set the field value and calculate it's length */
@@ -685,7 +683,7 @@ static inline__ const uint8_t *stringify_error_code ( MSICallError error_code )
  * @param msg The message.
  * @param to Where to.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int send_message ( MSISession *session, MSICall* call, MSIMessage *msg, uint32_t to )
@@ -838,7 +836,7 @@ int handle_error ( MSISession *session, MSICall* call, MSICallError errid, uint3
  * @param msg The message.
  * @return int
  * @retval -1 No error.
- * @retval 0 Error occured and response sent.
+ * @retval 0 Error occurred and response sent.
  */
 int has_call_error ( MSISession *session, MSICall* call, MSIMessage *msg )
 {
@@ -951,7 +949,7 @@ MSICall *init_call ( MSISession *session, int peers, int ringing_timeout )
  *
  * @param session Control session.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int terminate_call ( MSISession *session, MSICall *call )
@@ -1031,7 +1029,7 @@ int handle_recv_invite ( MSISession *session, MSICall* call, MSIMessage *msg )
              * B calls A. Who has advantage is set bey calculating
              * 'bigger' Call id and then that call id is being used in
              * future. User with 'bigger' Call id has the advantage
-             * as in he will wait the reponse from the other.
+             * as in he will wait the response from the other.
              */
             
             if ( call_id_bigger (call->id, msg->callid.header_value) == 1 ) { /* Peer has advantage */
@@ -1408,7 +1406,7 @@ void msi_register_callback ( MSICallback callback, MSICallbackID id, void* userd
  * @param messenger Tox* object.
  * @param max_calls Amount of calls possible
  * @return MSISession* The created session.
- * @retval NULL Error occured.
+ * @retval NULL Error occurred.
  */
 MSISession *msi_init_session ( Messenger* messenger, int32_t max_calls )
 {
@@ -1530,7 +1528,7 @@ int msi_invite ( MSISession* session, int32_t* call_index, MSICallType call_type
  * @param session Control session.
  * @param call_id To which call is this action handled.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int msi_hangup ( MSISession* session, int32_t call_index )