diff options
author | irungentoo <irungentoo@gmail.com> | 2013-08-02 12:17:24 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-08-02 12:17:24 -0400 |
commit | 2a074d116048054e1187425574573a07afa74243 (patch) | |
tree | f4e78031155dc7ff3676d2e88bc7003f7bb0a649 | |
parent | df8a8ff67e3539cb3588f2e5a84e70b9c35973ea (diff) | |
parent | eba7fdb9ba0dc76a06098c03a80fb218b2c53cc3 (diff) |
Merge branch 'master' into Jeffail-master
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | core/Messenger.c | 6 |
2 files changed, 1 insertions, 6 deletions
@@ -47,6 +47,7 @@ configure for the normal user or suffer from being way too centralized. | |||
47 | ### Documentation: | 47 | ### Documentation: |
48 | 48 | ||
49 | - [Installation](/INSTALL.md) | 49 | - [Installation](/INSTALL.md) |
50 | - [Commands](/docs/commands.rst) | ||
50 | - [DHT Protocol](https://github.com/irungentoo/ProjectTox-Core/wiki/DHT)<br /> | 51 | - [DHT Protocol](https://github.com/irungentoo/ProjectTox-Core/wiki/DHT)<br /> |
51 | - [Lossless UDP Protocol](https://github.com/irungentoo/ProjectTox-Core/wiki/Lossless-UDP)<br /> | 52 | - [Lossless UDP Protocol](https://github.com/irungentoo/ProjectTox-Core/wiki/Lossless-UDP)<br /> |
52 | - [Crypto](https://github.com/irungentoo/ProjectTox-Core/wiki/Crypto)<br /> | 53 | - [Crypto](https://github.com/irungentoo/ProjectTox-Core/wiki/Crypto)<br /> |
diff --git a/core/Messenger.c b/core/Messenger.c index 30f3f658..8f1ed41a 100644 --- a/core/Messenger.c +++ b/core/Messenger.c | |||
@@ -71,12 +71,6 @@ int getfriend_id(uint8_t *client_id) | |||
71 | return -1; | 71 | return -1; |
72 | } | 72 | } |
73 | 73 | ||
74 | /* Returns number of friends */ | ||
75 | int getnumfriends() | ||
76 | { | ||
77 | return numfriends; | ||
78 | } | ||
79 | |||
80 | /* copies the public key associated to that friend id into client_id buffer. | 74 | /* copies the public key associated to that friend id into client_id buffer. |
81 | make sure that client_id is of size CLIENT_ID_SIZE. | 75 | make sure that client_id is of size CLIENT_ID_SIZE. |
82 | return 0 if success | 76 | return 0 if success |