Skip to content

Commit

Permalink
refactor: Compare pointers in if conditions to nullptr.
Browse files Browse the repository at this point in the history 
Don't use implicit ptr-to-bool conversion.
  • Loading branch information
@iphydf
iphydf committed Feb 17, 2022
1 parent 43fc237 commit 5300312
Show file tree
Hide file tree
Showing 17 changed files with 152 additions and 125 deletions.
18 changes: 18 additions & 0 deletions other/docker/typecheck/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM toxchat/haskell:hs-tokstyle AS tokstyle
FROM ubuntu:20.04

RUN apt-get update && apt-get install --no-install-recommends -y \
ca-certificates \
gcc \
git \
libmsgpack-dev \
libsodium-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

COPY --from=tokstyle /bin/check-c /bin/
RUN git clone --depth=1 https://github.com/TokTok/hs-tokstyle /src/workspace/hs-tokstyle

COPY toxcore/ /src/workspace/c-toxcore/toxcore/
COPY toxencryptsave/ /src/workspace/c-toxcore/toxencryptsave/
RUN /bin/check-c /src/workspace/c-toxcore/toxcore/*.c
19 changes: 13 additions & 6 deletions toxcore/DHT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,10 @@ int unpack_ip_port(IP_Port *ip_port, const uint8_t *data, uint16_t length, bool
}

*ip_port = (IP_Port) {
0
{{
0
}
}
};

if (is_ipv4) {
Expand Down Expand Up @@ -641,7 +644,7 @@ int unpack_nodes(Node_format *nodes, uint16_t max_num_nodes, uint16_t *processed
assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6);
}

if (processed_data_len) {
if (processed_data_len != nullptr) {
*processed_data_len = len_processed;
}

Expand Down Expand Up @@ -800,7 +803,11 @@ static int client_or_ip_port_in_list(const Logger *log, const Mono_Time *mono_ti

/* kill the other address, if it was set */
*assoc = (IPPTsPng) {
0
{{{
0
}
}
}
};
return 1;
}
Expand Down Expand Up @@ -1251,7 +1258,7 @@ uint32_t addto_lists(DHT *dht, const IP_Port *ip_port, const uint8_t *public_key
}

for (uint32_t i = 0; i < friend_foundip->lock_count; ++i) {
if (friend_foundip->callbacks[i].ip_callback) {
if (friend_foundip->callbacks[i].ip_callback != nullptr) {
friend_foundip->callbacks[i].ip_callback(friend_foundip->callbacks[i].data,
friend_foundip->callbacks[i].number, &ipp_copy);
}
Expand Down Expand Up @@ -1567,7 +1574,7 @@ static int handle_sendnodes_ipv6(void *object, const IP_Port *source, const uint
ping_node_from_getnodes_ok(dht, plain_nodes[i].public_key, &plain_nodes[i].ip_port);
returnedip_ports(dht, &plain_nodes[i].ip_port, plain_nodes[i].public_key, packet + 1);

if (dht->get_nodes_response) {
if (dht->get_nodes_response != nullptr) {
dht->get_nodes_response(dht, &plain_nodes[i], userdata);
}
}
Expand All @@ -1589,7 +1596,7 @@ static void dht_friend_lock(DHT_Friend *const dht_friend, dht_ip_cb *ip_callback
dht_friend->callbacks[lock_num].data = data;
dht_friend->callbacks[lock_num].number = number;

if (lock_count) {
if (lock_count != nullptr) {
*lock_count = lock_num + 1;
}
}
Expand Down
64 changes: 32 additions & 32 deletions toxcore/Messenger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ static int do_receipts(Messenger *m, int32_t friendnumber, void *userdata)
break;
}

if (m->read_receipt) {
if (m->read_receipt != nullptr) {
m->read_receipt(m, friendnumber, receipts->msg_id, userdata);
}

Expand Down Expand Up @@ -414,7 +414,7 @@ int m_delfriend(Messenger *m, int32_t friendnumber)
return -1;
}

if (m->friend_connectionstatuschange_internal) {
if (m->friend_connectionstatuschange_internal != nullptr) {
m->friend_connectionstatuschange_internal(m, friendnumber, 0, m->friend_connectionstatuschange_internal_userdata);
}

Expand Down Expand Up @@ -543,7 +543,7 @@ int m_send_message_generic(Messenger *m, int32_t friendnumber, uint8_t type, con

add_receipt(m, friendnumber, packet_num, msg_id);

if (message_id) {
if (message_id != nullptr) {
*message_id = msg_id;
}

Expand Down Expand Up @@ -959,7 +959,7 @@ static void check_friend_tcp_udp(Messenger *m, int32_t friendnumber, void *userd
}

if (last_connection_udp_tcp != ret) {
if (m->friend_connectionstatuschange) {
if (m->friend_connectionstatuschange != nullptr) {
m->friend_connectionstatuschange(m, friendnumber, ret, userdata);
}
}
Expand Down Expand Up @@ -995,7 +995,7 @@ static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, ui

check_friend_tcp_udp(m, friendnumber, userdata);

if (m->friend_connectionstatuschange_internal) {
if (m->friend_connectionstatuschange_internal != nullptr) {
m->friend_connectionstatuschange_internal(m, friendnumber, is_online,
m->friend_connectionstatuschange_internal_userdata);
}
Expand Down Expand Up @@ -1535,7 +1535,7 @@ static bool do_all_filetransfers(Messenger *m, int32_t friendnumber, void *userd

// If the file transfer is complete, we request a chunk of size 0.
if (ft->status == FILESTATUS_FINISHED && friend_received_packet(m, friendnumber, ft->last_packet_number) == 0) {
if (m->file_reqchunk) {
if (m->file_reqchunk != nullptr) {
m->file_reqchunk(m, friendnumber, i, ft->transferred, 0, userdata);
}

Expand All @@ -1558,7 +1558,7 @@ static bool do_all_filetransfers(Messenger *m, int32_t friendnumber, void *userd
const uint64_t position = ft->requested;
ft->requested += length;

if (m->file_reqchunk) {
if (m->file_reqchunk != nullptr) {
m->file_reqchunk(m, friendnumber, i, position, length, userdata);
}

Expand Down Expand Up @@ -1687,7 +1687,7 @@ static int handle_filecontrol(Messenger *m, int32_t friendnumber, uint8_t receiv
}
}

if (m->file_filecontrol) {
if (m->file_filecontrol != nullptr) {
m->file_filecontrol(m, friendnumber, real_filenumber, control_type, userdata);
}

Expand All @@ -1703,15 +1703,15 @@ static int handle_filecontrol(Messenger *m, int32_t friendnumber, uint8_t receiv

ft->paused |= FILE_PAUSE_OTHER;

if (m->file_filecontrol) {
if (m->file_filecontrol != nullptr) {
m->file_filecontrol(m, friendnumber, real_filenumber, control_type, userdata);
}

return 0;
}

case FILECONTROL_KILL: {
if (m->file_filecontrol) {
if (m->file_filecontrol != nullptr) {
m->file_filecontrol(m, friendnumber, real_filenumber, control_type, userdata);
}

Expand Down Expand Up @@ -1794,14 +1794,14 @@ static int m_handle_lossy_packet(void *object, int friend_num, const uint8_t *pa
const RTP_Packet_Handler *const ph =
&m->friendlist[friend_num].lossy_rtp_packethandlers[packet[0] % PACKET_ID_RANGE_LOSSY_AV_SIZE];

if (ph->function) {
if (ph->function != nullptr) {
return ph->function(m, friend_num, packet, length, ph->object);
}

return 1;
}

if (m->lossy_packethandler) {
if (m->lossy_packethandler != nullptr) {
m->lossy_packethandler(m, friend_num, packet[0], packet, length, userdata);
}

Expand Down Expand Up @@ -1887,7 +1887,7 @@ static int handle_custom_lossless_packet(void *object, int friend_num, const uin
return -1;
}

if (m->lossless_packethandler) {
if (m->lossless_packethandler != nullptr) {
m->lossless_packethandler(m, friend_num, packet[0], packet, length, userdata);
}

Expand Down Expand Up @@ -2014,7 +2014,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
data_terminated[data_length] = 0;

/* inform of namechange before we overwrite the old name */
if (m->friend_namechange) {
if (m->friend_namechange != nullptr) {
m->friend_namechange(m, i, data_terminated, data_length, userdata);
}

Expand All @@ -2034,7 +2034,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
memcpy(data_terminated, data, data_length);
data_terminated[data_length] = 0;

if (m->friend_statusmessagechange) {
if (m->friend_statusmessagechange != nullptr) {
m->friend_statusmessagechange(m, i, data_terminated, data_length, userdata);
}

Expand All @@ -2053,7 +2053,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
break;
}

if (m->friend_userstatuschange) {
if (m->friend_userstatuschange != nullptr) {
m->friend_userstatuschange(m, i, status, userdata);
}

Expand All @@ -2070,7 +2070,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le

set_friend_typing(m, i, typing);

if (m->friend_typingchange) {
if (m->friend_typingchange != nullptr) {
m->friend_typingchange(m, i, typing, userdata);
}

Expand All @@ -2092,7 +2092,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
message_terminated[message_length] = 0;
uint8_t type = packet_id - PACKET_ID_MESSAGE;

if (m->friend_message) {
if (m->friend_message != nullptr) {
m->friend_message(m, i, type, message_terminated, message_length, userdata);
}

Expand All @@ -2104,7 +2104,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
break;
}

if (m->conference_invite) {
if (m->conference_invite != nullptr) {
m->conference_invite(m, i, data, data_length, userdata);
}

Expand Down Expand Up @@ -2166,7 +2166,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
real_filenumber += 1;
real_filenumber <<= 16;

if (m->file_sendrequest) {
if (m->file_sendrequest != nullptr) {
m->file_sendrequest(m, i, real_filenumber, file_type, filesize, filename, filename_length,
userdata);
}
Expand Down Expand Up @@ -2239,7 +2239,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
file_data_length = ft->size - ft->transferred;
}

if (m->file_filedata) {
if (m->file_filedata != nullptr) {
m->file_filedata(m, i, real_filenumber, position, file_data, file_data_length, userdata);
}

Expand All @@ -2251,7 +2251,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
position = ft->transferred;

/* Full file received. */
if (m->file_filedata) {
if (m->file_filedata != nullptr) {
m->file_filedata(m, i, real_filenumber, position, file_data, file_data_length, userdata);
}
}
Expand All @@ -2269,7 +2269,7 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
break;
}

if (m->msi_packet) {
if (m->msi_packet != nullptr) {
m->msi_packet(m, i, data, data_length, m->msi_packet_userdata);
}

Expand Down Expand Up @@ -2352,7 +2352,7 @@ static void connection_status_callback(Messenger *m, void *userdata)
unsigned int conn_status = onion_connection_status(m->onion_c);

if (conn_status != m->last_connection_status) {
if (m->core_connection_change) {
if (m->core_connection_change != nullptr) {
m->core_connection_change(m, conn_status, userdata);
}

Expand Down Expand Up @@ -2414,7 +2414,7 @@ void do_messenger(Messenger *m, void *userdata)

m->num_loaded_relays = 0;

if (m->tcp_server) {
if (m->tcp_server != nullptr) {
/* Add self tcp server. */
IP_Port local_ip_port;
local_ip_port.port = m->options.tcp_server_port;
Expand All @@ -2429,7 +2429,7 @@ void do_messenger(Messenger *m, void *userdata)
do_dht(m->dht);
}

if (m->tcp_server) {
if (m->tcp_server != nullptr) {
do_TCP_server(m->tcp_server, m->mono_time);
}

Expand Down Expand Up @@ -2503,7 +2503,7 @@ void do_messenger(Messenger *m, void *userdata)
const Friend *const msgfptr = dht2m[friend_idx] >= 0 ? &m->friendlist[dht2m[friend_idx]] : nullptr;
const DHT_Friend *const dhtfptr = dht_get_friend(m->dht, friend_idx);

if (msgfptr) {
if (msgfptr != nullptr) {
char id_str[IDSTRING_LEN];
LOGGER_TRACE(m->log, "F[%2u:%2u] <%s> %s",
dht2m[friend_idx], friend_idx, msgfptr->name,
Expand Down Expand Up @@ -2996,7 +2996,7 @@ static uint32_t tcp_relay_size(const Messenger *m)
non_null()
static uint8_t *save_tcp_relays(const Messenger *m, uint8_t *data)
{
Node_format relays[NUM_SAVED_TCP_RELAYS] = {0};
Node_format relays[NUM_SAVED_TCP_RELAYS] = {{{0}}};
uint8_t *temp_data = data;
data = state_write_section_header(temp_data, STATE_COOKIE_TYPE, 0, STATE_TYPE_TCP_RELAY);

Expand Down Expand Up @@ -3170,7 +3170,7 @@ Messenger *new_messenger(Mono_Time *mono_time, Messenger_Options *options, unsig
return nullptr;
}

if (error) {
if (error != nullptr) {
*error = MESSENGER_ERROR_OTHER;
}

Expand Down Expand Up @@ -3283,7 +3283,7 @@ Messenger *new_messenger(Mono_Time *mono_time, Messenger_Options *options, unsig
logger_kill(m->log);
free(m);

if (error) {
if (error != nullptr) {
*error = MESSENGER_ERROR_TCP_SERVER;
}

Expand All @@ -3301,7 +3301,7 @@ Messenger *new_messenger(Mono_Time *mono_time, Messenger_Options *options, unsig

m_register_default_plugins(m);

if (error) {
if (error != nullptr) {
*error = MESSENGER_ERROR_NONE;
}

Expand All @@ -3317,7 +3317,7 @@ void kill_messenger(Messenger *m)
return;
}

if (m->tcp_server) {
if (m->tcp_server != nullptr) {
kill_TCP_server(m->tcp_server);
}

Expand Down
2 changes: 2 additions & 0 deletions toxcore/Messenger.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#ifndef C_TOXCORE_TOXCORE_MESSENGER_H
#define C_TOXCORE_TOXCORE_MESSENGER_H

#include <time.h>

#include "TCP_server.h"
#include "friend_connection.h"
#include "friend_requests.h"
Expand Down
Loading

0 comments on commit 5300312

Please sign in to comment.