diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-07-19 21:54:30 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-07-21 14:46:31 +0000 |
commit | b6b3cdbf2551d001478441576d55a14b764889fb (patch) | |
tree | 6806fd82beee0c647d022861abb7b28936623cba | |
parent | 9a96bb9a5bb414afb137c094f987740581ecebda (diff) |
Synchronise parameter names in headers with those in the implementation.
-rw-r--r-- | toxav/bwcontroller.h | 4 | ||||
-rw-r--r-- | toxcore/Messenger.h | 6 | ||||
-rw-r--r-- | toxcore/TCP_client.h | 2 | ||||
-rw-r--r-- | toxcore/network.h | 8 | ||||
-rw-r--r-- | toxcore/onion_client.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/toxav/bwcontroller.h b/toxav/bwcontroller.h index be5eb191..fdbc1746 100644 --- a/toxav/bwcontroller.h +++ b/toxav/bwcontroller.h | |||
@@ -30,7 +30,7 @@ BWController *bwc_new(Messenger *m, uint32_t friendnumber, | |||
30 | 30 | ||
31 | void bwc_kill(BWController *bwc); | 31 | void bwc_kill(BWController *bwc); |
32 | 32 | ||
33 | void bwc_add_lost(BWController *bwc, uint32_t bytes); | 33 | void bwc_add_lost(BWController *bwc, uint32_t bytes_lost); |
34 | void bwc_add_recv(BWController *bwc, uint32_t bytes); | 34 | void bwc_add_recv(BWController *bwc, uint32_t recv_bytes); |
35 | 35 | ||
36 | #endif /* BWCONROLLER_H */ | 36 | #endif /* BWCONROLLER_H */ |
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h index 8a4686f1..cd872a2d 100644 --- a/toxcore/Messenger.h +++ b/toxcore/Messenger.h | |||
@@ -689,14 +689,14 @@ int m_msi_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, | |||
689 | * return 0 on success. | 689 | * return 0 on success. |
690 | */ | 690 | */ |
691 | int m_callback_rtp_packet(Messenger *m, int32_t friendnumber, uint8_t byte, | 691 | int m_callback_rtp_packet(Messenger *m, int32_t friendnumber, uint8_t byte, |
692 | m_lossy_rtp_packet_cb *packet_handler_callback, void *object); | 692 | m_lossy_rtp_packet_cb *function, void *object); |
693 | 693 | ||
694 | /**********************************************/ | 694 | /**********************************************/ |
695 | 695 | ||
696 | /* Set handlers for custom lossy packets. | 696 | /* Set handlers for custom lossy packets. |
697 | * | 697 | * |
698 | */ | 698 | */ |
699 | void custom_lossy_packet_registerhandler(Messenger *m, m_friend_lossy_packet_cb *packet_handler_callback); | 699 | void custom_lossy_packet_registerhandler(Messenger *m, m_friend_lossy_packet_cb *lossy_packethandler); |
700 | 700 | ||
701 | /* High level function to send custom lossy packets. | 701 | /* High level function to send custom lossy packets. |
702 | * | 702 | * |
@@ -713,7 +713,7 @@ int m_send_custom_lossy_packet(const Messenger *m, int32_t friendnumber, const u | |||
713 | /* Set handlers for custom lossless packets. | 713 | /* Set handlers for custom lossless packets. |
714 | * | 714 | * |
715 | */ | 715 | */ |
716 | void custom_lossless_packet_registerhandler(Messenger *m, m_friend_lossless_packet_cb *packet_handler_callback); | 716 | void custom_lossless_packet_registerhandler(Messenger *m, m_friend_lossless_packet_cb *lossless_packethandler); |
717 | 717 | ||
718 | /* High level function to send custom lossless packets. | 718 | /* High level function to send custom lossless packets. |
719 | * | 719 | * |
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h index 8bfe4155..6d1cbb3b 100644 --- a/toxcore/TCP_client.h +++ b/toxcore/TCP_client.h | |||
@@ -60,7 +60,7 @@ TCP_Client_Status tcp_con_status(const TCP_Client_Connection *con); | |||
60 | void *tcp_con_custom_object(const TCP_Client_Connection *con); | 60 | void *tcp_con_custom_object(const TCP_Client_Connection *con); |
61 | uint32_t tcp_con_custom_uint(const TCP_Client_Connection *con); | 61 | uint32_t tcp_con_custom_uint(const TCP_Client_Connection *con); |
62 | void tcp_con_set_custom_object(TCP_Client_Connection *con, void *object); | 62 | void tcp_con_set_custom_object(TCP_Client_Connection *con, void *object); |
63 | void tcp_con_set_custom_uint(TCP_Client_Connection *con, uint32_t uint); | 63 | void tcp_con_set_custom_uint(TCP_Client_Connection *con, uint32_t value); |
64 | 64 | ||
65 | /* Create new TCP connection to ip_port/public_key | 65 | /* Create new TCP connection to ip_port/public_key |
66 | */ | 66 | */ |
diff --git a/toxcore/network.h b/toxcore/network.h index 7f7cde60..276896b6 100644 --- a/toxcore/network.h +++ b/toxcore/network.h | |||
@@ -76,19 +76,19 @@ extern const Socket net_invalid_socket; | |||
76 | /** | 76 | /** |
77 | * Calls send(sockfd, buf, len, MSG_NOSIGNAL). | 77 | * Calls send(sockfd, buf, len, MSG_NOSIGNAL). |
78 | */ | 78 | */ |
79 | int net_send(Socket sockfd, const void *buf, size_t len); | 79 | int net_send(Socket sock, const void *buf, size_t len); |
80 | /** | 80 | /** |
81 | * Calls recv(sockfd, buf, len, MSG_NOSIGNAL). | 81 | * Calls recv(sockfd, buf, len, MSG_NOSIGNAL). |
82 | */ | 82 | */ |
83 | int net_recv(Socket sockfd, void *buf, size_t len); | 83 | int net_recv(Socket sock, void *buf, size_t len); |
84 | /** | 84 | /** |
85 | * Calls listen(sockfd, backlog). | 85 | * Calls listen(sockfd, backlog). |
86 | */ | 86 | */ |
87 | int net_listen(Socket sockfd, int backlog); | 87 | int net_listen(Socket sock, int backlog); |
88 | /** | 88 | /** |
89 | * Calls accept(sockfd, nullptr, nullptr). | 89 | * Calls accept(sockfd, nullptr, nullptr). |
90 | */ | 90 | */ |
91 | Socket net_accept(Socket sockfd); | 91 | Socket net_accept(Socket sock); |
92 | 92 | ||
93 | /** | 93 | /** |
94 | * return the amount of data in the tcp recv buffer. | 94 | * return the amount of data in the tcp recv buffer. |
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h index 6e73c3ab..660ccdd2 100644 --- a/toxcore/onion_client.h +++ b/toxcore/onion_client.h | |||
@@ -135,7 +135,7 @@ typedef int recv_tcp_relay_cb(void *object, uint32_t number, IP_Port ip_port, co | |||
135 | * return 0 on success. | 135 | * return 0 on success. |
136 | */ | 136 | */ |
137 | int recv_tcp_relay_handler(Onion_Client *onion_c, int friend_num, | 137 | int recv_tcp_relay_handler(Onion_Client *onion_c, int friend_num, |
138 | recv_tcp_relay_cb *tcp_relay_node_callback, void *object, uint32_t number); | 138 | recv_tcp_relay_cb *callback, void *object, uint32_t number); |
139 | 139 | ||
140 | typedef void onion_dht_pk_cb(void *data, int32_t number, const uint8_t *dht_public_key, void *userdata); | 140 | typedef void onion_dht_pk_cb(void *data, int32_t number, const uint8_t *dht_public_key, void *userdata); |
141 | 141 | ||