5 files changed, 87 insertions, 17 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index cb588adf..32e81389 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1653,6 +1653,54 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
         return Messenger_load_old(m, data, length);
 }
 
+/* Return the number of friends in the instance m.
+ * You should use this to determine how much memory to allocate
+ * for copy_friendlist. */
+uint32_t count_friendlist(Messenger *m)
+{
+    uint32_t ret = 0;
+    uint32_t i;
+
+    for (i = 0; i < m->numfriends; i++) {
+        if (m->friendlist[i].status > 0) {
+            ret++;
+        }
+    }
+
+    return ret;
+}
+
+/* Copy a list of valid friend IDs into the array out_list.
+ * If out_list is NULL, returns 0.
+ * Otherwise, returns the number of elements copied.
+ * If the array was too small, the contents
+ * of out_list will be truncated to list_size. */
+uint32_t copy_friendlist(Messenger *m, int *out_list, uint32_t list_size)
+{
+    if (!out_list)
+        return 0;
+
+    if (m->numfriends == 0) {
+        return 0;
+    }
+
+    uint32_t i;
+    uint32_t ret = 0;
+
+    for (i = 0; i < m->numfriends; i++) {
+        if (i >= list_size) {
+            break; /* Abandon ship */
+        }
+
+        if (m->friendlist[i].status > 0) {
+            out_list[i] = i;
+            ret++;
+        }
+    }
+
+    return ret;
+}
+
 /* Allocate and return a list of valid friend id's. List must be freed by the
  * caller.
  *
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 78580dc0..2b29896c 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -456,6 +456,18 @@ void Messenger_save(Messenger *m, uint8_t *data);
 /* Load the messenger from data of size length. */
 int Messenger_load(Messenger *m, uint8_t *data, uint32_t length);
 
+/* Return the number of friends in the instance m.
+ * You should use this to determine how much memory to allocate
+ * for copy_friendlist. */
+uint32_t count_friendlist(Messenger *m);
+
+/* Copy a list of valid friend IDs into the array out_list.
+ * If out_list is NULL, returns 0.
+ * Otherwise, returns the number of elements copied.
+ * If the array was too small, the contents
+ * of out_list will be truncated to list_size. */
+uint32_t copy_friendlist(Messenger *m, int *out_list, uint32_t list_size);
+
 /* Allocate and return a list of valid friend id's. List must be freed by the
  * caller.
  *
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 2da2ba3b..98571ce7 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -503,8 +503,6 @@ int crypto_connect(Net_Crypto *c, uint8_t *public_key, IP_Port ip_port)
  */
 int crypto_inbound(Net_Crypto *c, uint8_t *public_key, uint8_t *secret_nonce, uint8_t *session_key)
 {
-    uint32_t i, j;
-
     while (1) {
         int incoming_con = incoming_connection(c->lossless_udp, 1);
 
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 4fba360b..fa53e693 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -262,16 +262,24 @@ void tox_set_sends_receipts(void *tox, int friendnumber, int yesno)
     m_set_sends_receipts(m, friendnumber, yesno);
 }
 
-/* Allocate and return a list of valid friend id's. List must be freed by the
- * caller.
- *
- * retun 0 if success.
- * return -1 if failure.
- */
-int tox_get_friendlist(void *tox, int **out_list, uint32_t *out_list_length)
+/* Return the number of friends in the instance m.
+ * You should use this to determine how much memory to allocate
+ * for copy_friendlist. */
+uint32_t tox_count_friendlist(void *tox)
+{
+    Messenger *m = tox;
+    return count_friendlist(m);
+}
+
+/* Copy a list of valid friend IDs into the array out_list.
+ * If out_list is NULL, returns 0.
+ * Otherwise, returns the number of elements copied.
+ * If the array was too small, the contents
+ * of out_list will be truncated to list_size. */
+uint32_t tox_copy_friendlist(void *tox, int *out_list, uint32_t list_size)
 {
     Messenger *m = tox;
-    return get_friendlist(m, out_list, out_list_length);
+    return copy_friendlist(m, out_list, list_size);
 }
 
 /* Set the function that will be executed when a friend request is received.
diff --git a/toxcore/tox.h b/toxcore/tox.h
index b39008fe..9c810418 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -280,13 +280,17 @@ TOX_USERSTATUS tox_get_selfuserstatus(Tox *tox);
  */
 void tox_set_sends_receipts(Tox *tox, int friendnumber, int yesno);
 
-/* Allocate and return a list of valid friend id's. List must be freed by the
- * caller.
- *
- * retun 0 if success.
- * return -1 if failure.
- */
-int tox_get_friendlist(void *tox, int **out_list, uint32_t *out_list_length);
+/* Return the number of friends in the instance m.
+ * You should use this to determine how much memory to allocate
+ * for copy_friendlist. */
+uint32_t tox_count_friendlist(void *tox);
+
+/* Copy a list of valid friend IDs into the array out_list.
+ * If out_list is NULL, returns 0.
+ * Otherwise, returns the number of elements copied.
+ * If the array was too small, the contents
+ * of out_list will be truncated to list_size. */
+uint32_t tox_copy_friendlist(void *tox, int *out_list, uint32_t list_size);
 
 /* 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)