Code cleanups.

2 files changed, 9 insertions, 9 deletions

diff --git a/toxcore/friend_requests.c b/toxcore/friend_requests.c
index 98937131..e4a10008 100644
--- a/toxcore/friend_requests.c
+++ b/toxcore/friend_requests.c
@@ -58,12 +58,12 @@ void set_filter_function(Friend_Requests *fr, int (*function)(const uint8_t *, v
 }
 
 /* Add to list of received friend requests. */
-static void addto_receivedlist(Friend_Requests *fr, const uint8_t *client_id)
+static void addto_receivedlist(Friend_Requests *fr, const uint8_t *real_pk)
 {
     if (fr->received_requests_index >= MAX_RECEIVED_STORED)
         fr->received_requests_index = 0;
 
-    id_copy(fr->received_requests[fr->received_requests_index], client_id);
+    id_copy(fr->received_requests[fr->received_requests_index], real_pk);
     ++fr->received_requests_index;
 }
 
@@ -72,28 +72,28 @@ static void addto_receivedlist(Friend_Requests *fr, const uint8_t *client_id)
  *  return 0 if it did not.
  *  return 1 if it did.
  */
-static int request_received(Friend_Requests *fr, const uint8_t *client_id)
+static int request_received(Friend_Requests *fr, const uint8_t *real_pk)
 {
     uint32_t i;
 
     for (i = 0; i < MAX_RECEIVED_STORED; ++i)
-        if (id_equal(fr->received_requests[i], client_id))
+        if (id_equal(fr->received_requests[i], real_pk))
             return 1;
 
     return 0;
 }
 
-/* Remove client id from received_requests list.
+/* Remove real pk from received_requests list.
  *
  *  return 0 if it removed it successfully.
  *  return -1 if it didn't find it.
  */
-int remove_request_received(Friend_Requests *fr, const uint8_t *client_id)
+int remove_request_received(Friend_Requests *fr, const uint8_t *real_pk)
 {
     uint32_t i;
 
     for (i = 0; i < MAX_RECEIVED_STORED; ++i) {
-        if (id_equal(fr->received_requests[i], client_id)) {
+        if (id_equal(fr->received_requests[i], real_pk)) {
             memset(fr->received_requests[i], 0, crypto_box_PUBLICKEYBYTES);
             return 0;
         }
diff --git a/toxcore/friend_requests.h b/toxcore/friend_requests.h
index b7e07af4..86069f3b 100644
--- a/toxcore/friend_requests.h
+++ b/toxcore/friend_requests.h
@@ -51,12 +51,12 @@ typedef struct {
 void set_nospam(Friend_Requests *fr, uint32_t num);
 uint32_t get_nospam(const Friend_Requests *fr);
 
-/* Remove client id from received_requests list.
+/* Remove real_pk from received_requests list.
  *
  *  return 0 if it removed it successfully.
  *  return -1 if it didn't find it.
  */
-int remove_request_received(Friend_Requests *fr, const uint8_t *client_id);
+int remove_request_received(Friend_Requests *fr, const uint8_t *real_pk);
 
 /* Set the function that will be executed when a friend request for us is received.
  *  Function format is function(uint8_t * public_key, uint8_t * data, uint16_t length, void * userdata)