Skip to content

Commit

Permalink
Invert not_valid functions and name them is_valid.
Browse files Browse the repository at this point in the history 
Also changed their return type to bool instead of 1/0 ints.
  • Loading branch information
@iphydf
iphydf committed Apr 19, 2020
1 parent 3ad953c commit 6ebcd36
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 69 deletions.
86 changes: 42 additions & 44 deletions toxcore/Messenger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@ static int write_cryptpacket_id(const Messenger *m, int32_t friendnumber, uint8_
uint32_t length, uint8_t congestion_control);
static void m_register_default_plugins(Messenger *m);

// friend_not_valid determines if the friendnumber passed is valid in the Messenger object
static uint8_t friend_not_valid(const Messenger *m, int32_t friendnumber)
/**
* Determines if the friendnumber passed is valid in the Messenger object.
*
* @param friendnumber The index in the friend list.
*/
static bool friend_is_valid(const Messenger *m, int32_t friendnumber)
{
if ((unsigned int)friendnumber < m->numfriends) {
if (m->friendlist[friendnumber].status != 0) {
return 0;
}
}

return 1;
return (unsigned int)friendnumber < m->numfriends && m->friendlist[friendnumber].status != 0;
}

/* Set the size of the friend list to numfriends.
Expand Down Expand Up @@ -88,7 +86,7 @@ int32_t getfriend_id(const Messenger *m, const uint8_t *real_pk)
*/
int get_real_pk(const Messenger *m, int32_t friendnumber, uint8_t *real_pk)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -101,7 +99,7 @@ int get_real_pk(const Messenger *m, int32_t friendnumber, uint8_t *real_pk)
*/
int getfriendcon_id(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -140,7 +138,7 @@ void getaddress(const Messenger *m, uint8_t *address)

static int send_online_packet(Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return 0;
}

Expand Down Expand Up @@ -301,7 +299,7 @@ int32_t m_addfriend_norequest(Messenger *m, const uint8_t *real_pk)

static int clear_receipts(Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -320,7 +318,7 @@ static int clear_receipts(Messenger *m, int32_t friendnumber)

static int add_receipt(Messenger *m, int32_t friendnumber, uint32_t packet_num, uint32_t msg_id)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -349,7 +347,7 @@ static int add_receipt(Messenger *m, int32_t friendnumber, uint32_t packet_num,
*/
static int friend_received_packet(const Messenger *m, int32_t friendnumber, uint32_t number)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -359,7 +357,7 @@ static int friend_received_packet(const Messenger *m, int32_t friendnumber, uint

static int do_receipts(Messenger *m, int32_t friendnumber, void *userdata)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -397,7 +395,7 @@ static int do_receipts(Messenger *m, int32_t friendnumber, void *userdata)
*/
int m_delfriend(Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -435,7 +433,7 @@ int m_delfriend(Messenger *m, int32_t friendnumber)

int m_get_friend_connectionstatus(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -463,7 +461,7 @@ int m_get_friend_connectionstatus(const Messenger *m, int32_t friendnumber)

int m_friend_exists(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return 0;
}

Expand All @@ -487,7 +485,7 @@ int m_send_message_generic(Messenger *m, int32_t friendnumber, uint8_t type, con
return -5;
}

if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
LOGGER_ERROR(m->log, "Friend number %d is invalid", friendnumber);
return -1;
}
Expand Down Expand Up @@ -548,7 +546,7 @@ static int m_sendname(const Messenger *m, int32_t friendnumber, const uint8_t *n
*/
int setfriendname(Messenger *m, int32_t friendnumber, const uint8_t *name, uint16_t length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -617,7 +615,7 @@ uint16_t getself_name(const Messenger *m, uint8_t *name)
*/
int getname(const Messenger *m, int32_t friendnumber, uint8_t *name)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -627,7 +625,7 @@ int getname(const Messenger *m, int32_t friendnumber, uint8_t *name)

int m_get_name_size(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -689,7 +687,7 @@ int m_set_userstatus(Messenger *m, uint8_t status)
*/
int m_get_statusmessage_size(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -701,7 +699,7 @@ int m_get_statusmessage_size(const Messenger *m, int32_t friendnumber)
*/
int m_copy_statusmessage(const Messenger *m, int32_t friendnumber, uint8_t *buf, uint32_t maxlen)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -730,7 +728,7 @@ int m_copy_self_statusmessage(const Messenger *m, uint8_t *buf)

uint8_t m_get_userstatus(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return USERSTATUS_INVALID;
}

Expand All @@ -750,7 +748,7 @@ uint8_t m_get_self_userstatus(const Messenger *m)

uint64_t m_get_last_online(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return UINT64_MAX;
}

Expand All @@ -763,7 +761,7 @@ int m_set_usertyping(Messenger *m, int32_t friendnumber, uint8_t is_typing)
return -1;
}

if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -779,7 +777,7 @@ int m_set_usertyping(Messenger *m, int32_t friendnumber, uint8_t is_typing)

int m_get_istyping(const Messenger *m, int32_t friendnumber)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -804,7 +802,7 @@ static int send_user_istyping(const Messenger *m, int32_t friendnumber, uint8_t

static int set_friend_statusmessage(const Messenger *m, int32_t friendnumber, const uint8_t *status, uint16_t length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -952,7 +950,7 @@ static void set_friend_status(Messenger *m, int32_t friendnumber, uint8_t status
static int write_cryptpacket_id(const Messenger *m, int32_t friendnumber, uint8_t packet_id, const uint8_t *data,
uint32_t length, uint8_t congestion_control)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return 0;
}

Expand Down Expand Up @@ -1033,7 +1031,7 @@ void callback_file_reqchunk(Messenger *m, m_file_chunk_request_cb *function)
*/
int file_get_id(const Messenger *m, int32_t friendnumber, uint32_t filenumber, uint8_t *file_id)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -1082,7 +1080,7 @@ int file_get_id(const Messenger *m, int32_t friendnumber, uint32_t filenumber, u
static int file_sendrequest(const Messenger *m, int32_t friendnumber, uint8_t filenumber, uint32_t file_type,
uint64_t filesize, const uint8_t *file_id, const uint8_t *filename, uint16_t filename_length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return 0;
}

Expand Down Expand Up @@ -1116,7 +1114,7 @@ static int file_sendrequest(const Messenger *m, int32_t friendnumber, uint8_t fi
long int new_filesender(const Messenger *m, int32_t friendnumber, uint32_t file_type, uint64_t filesize,
const uint8_t *file_id, const uint8_t *filename, uint16_t filename_length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -1195,7 +1193,7 @@ static int send_file_control_packet(const Messenger *m, int32_t friendnumber, ui
*/
int file_control(const Messenger *m, int32_t friendnumber, uint32_t filenumber, unsigned int control)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -1296,7 +1294,7 @@ int file_control(const Messenger *m, int32_t friendnumber, uint32_t filenumber,
*/
int file_seek(const Messenger *m, int32_t friendnumber, uint32_t filenumber, uint64_t position)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -1352,7 +1350,7 @@ int file_seek(const Messenger *m, int32_t friendnumber, uint32_t filenumber, uin
static int64_t send_file_data_packet(const Messenger *m, int32_t friendnumber, uint8_t filenumber, const uint8_t *data,
uint16_t length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -1384,7 +1382,7 @@ static int64_t send_file_data_packet(const Messenger *m, int32_t friendnumber, u
int file_data(const Messenger *m, int32_t friendnumber, uint32_t filenumber, uint64_t position, const uint8_t *data,
uint16_t length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -1455,7 +1453,7 @@ int file_data(const Messenger *m, int32_t friendnumber, uint32_t filenumber, uin
*/
uint64_t file_dataremaining(const Messenger *m, int32_t friendnumber, uint8_t filenumber, uint8_t send_receive)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return 0;
}

Expand Down Expand Up @@ -1776,7 +1774,7 @@ static int m_handle_lossy_packet(void *object, int friend_num, const uint8_t *pa
{
Messenger *m = (Messenger *)object;

if (friend_not_valid(m, friend_num)) {
if (!friend_is_valid(m, friend_num)) {
return 1;
}

Expand Down Expand Up @@ -1806,7 +1804,7 @@ void custom_lossy_packet_registerhandler(Messenger *m, m_friend_lossy_packet_cb
int m_callback_rtp_packet(Messenger *m, int32_t friendnumber, uint8_t byte, m_lossy_rtp_packet_cb *function,
void *object)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand All @@ -1829,7 +1827,7 @@ int m_callback_rtp_packet(Messenger *m, int32_t friendnumber, uint8_t byte, m_lo
*/
int m_send_custom_lossy_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down Expand Up @@ -1859,7 +1857,7 @@ static int handle_custom_lossless_packet(void *object, int friend_num, const uin
{
Messenger *m = (Messenger *)object;

if (friend_not_valid(m, friend_num)) {
if (!friend_is_valid(m, friend_num)) {
return -1;
}

Expand All @@ -1881,7 +1879,7 @@ void custom_lossless_packet_registerhandler(Messenger *m, m_friend_lossless_pack

int send_custom_lossless_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length)
{
if (friend_not_valid(m, friendnumber)) {
if (!friend_is_valid(m, friendnumber)) {
return -1;
}

Expand Down
Loading

0 comments on commit 6ebcd36

Please sign in to comment.