summaryrefslogtreecommitdiff
path: root/toxcore/tox.c
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-02-23 02:22:38 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-02-24 22:20:22 +0000
commitd3b286cb434ed228e7b62cc70cb293e7a5554bfa (patch)
tree9ab3dd66f9dba2ca861ba8c6e098fb96754aa80b /toxcore/tox.c
parentafc80922e720f5d2a93bdfb3745da058e5ddf81b (diff)
Fix a bunch of compiler warnings and remove suppressions.
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r--toxcore/tox.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 747411f1..caaaedba 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -82,7 +82,7 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error)
82{ 82{
83 Messenger_Options m_options = {0}; 83 Messenger_Options m_options = {0};
84 84
85 bool load_savedata_sk = 0, load_savedata_tox = 0; 85 bool load_savedata_sk = false, load_savedata_tox = false;
86 86
87 if (options == nullptr) { 87 if (options == nullptr) {
88 m_options.ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; 88 m_options.ipv6enabled = TOX_ENABLE_IPV6_DEFAULT;
@@ -100,7 +100,7 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error)
100 return nullptr; 100 return nullptr;
101 } 101 }
102 102
103 load_savedata_sk = 1; 103 load_savedata_sk = true;
104 } else if (tox_options_get_savedata_type(options) == TOX_SAVEDATA_TYPE_TOX_SAVE) { 104 } else if (tox_options_get_savedata_type(options) == TOX_SAVEDATA_TYPE_TOX_SAVE) {
105 if (tox_options_get_savedata_length(options) < TOX_ENC_SAVE_MAGIC_LENGTH) { 105 if (tox_options_get_savedata_length(options) < TOX_ENC_SAVE_MAGIC_LENGTH) {
106 SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_BAD_FORMAT); 106 SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_BAD_FORMAT);
@@ -112,7 +112,7 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error)
112 return nullptr; 112 return nullptr;
113 } 113 }
114 114
115 load_savedata_tox = 1; 115 load_savedata_tox = true;
116 } 116 }
117 117
118 m_options.ipv6enabled = tox_options_get_ipv6_enabled(options); 118 m_options.ipv6enabled = tox_options_get_ipv6_enabled(options);
@@ -156,7 +156,7 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error)
156 m_options.proxy_info.ip_port.ip.family = TOX_AF_UNSPEC; 156 m_options.proxy_info.ip_port.ip.family = TOX_AF_UNSPEC;
157 } 157 }
158 158
159 if (!addr_resolve_or_parse_ip(tox_options_get_proxy_host(options), &m_options.proxy_info.ip_port.ip, nullptr)) { 159 if (addr_resolve_or_parse_ip(tox_options_get_proxy_host(options), &m_options.proxy_info.ip_port.ip, nullptr) == 0) {
160 SET_ERROR_PARAMETER(error, TOX_ERR_NEW_PROXY_BAD_HOST); 160 SET_ERROR_PARAMETER(error, TOX_ERR_NEW_PROXY_BAD_HOST);
161 // TODO(irungentoo): TOX_ERR_NEW_PROXY_NOT_FOUND if domain. 161 // TODO(irungentoo): TOX_ERR_NEW_PROXY_NOT_FOUND if domain.
162 return nullptr; 162 return nullptr;
@@ -457,7 +457,8 @@ void tox_self_set_status(Tox *tox, TOX_USER_STATUS status)
457TOX_USER_STATUS tox_self_get_status(const Tox *tox) 457TOX_USER_STATUS tox_self_get_status(const Tox *tox)
458{ 458{
459 const Messenger *m = tox; 459 const Messenger *m = tox;
460 return (TOX_USER_STATUS)m_get_self_userstatus(m); 460 const uint8_t status = m_get_self_userstatus(m);
461 return (TOX_USER_STATUS)status;
461} 462}
462 463
463static void set_friend_error(int32_t ret, TOX_ERR_FRIEND_ADD *error) 464static void set_friend_error(int32_t ret, TOX_ERR_FRIEND_ADD *error)