diff options
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r-- | toxcore/tox.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index 11967f84..7dd4a7b5 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -84,32 +84,32 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error) | |||
84 | 84 | ||
85 | bool load_savedata_sk = 0, load_savedata_tox = 0; | 85 | bool load_savedata_sk = 0, load_savedata_tox = 0; |
86 | 86 | ||
87 | if (options == NULL) { | 87 | if (options == nullptr) { |
88 | m_options.ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; | 88 | m_options.ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; |
89 | } else { | 89 | } else { |
90 | if (tox_options_get_savedata_type(options) != TOX_SAVEDATA_TYPE_NONE) { | 90 | if (tox_options_get_savedata_type(options) != TOX_SAVEDATA_TYPE_NONE) { |
91 | if (tox_options_get_savedata_data(options) == NULL || tox_options_get_savedata_length(options) == 0) { | 91 | if (tox_options_get_savedata_data(options) == nullptr || tox_options_get_savedata_length(options) == 0) { |
92 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_BAD_FORMAT); | 92 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_BAD_FORMAT); |
93 | return NULL; | 93 | return nullptr; |
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | if (tox_options_get_savedata_type(options) == TOX_SAVEDATA_TYPE_SECRET_KEY) { | 97 | if (tox_options_get_savedata_type(options) == TOX_SAVEDATA_TYPE_SECRET_KEY) { |
98 | if (tox_options_get_savedata_length(options) != TOX_SECRET_KEY_SIZE) { | 98 | if (tox_options_get_savedata_length(options) != TOX_SECRET_KEY_SIZE) { |
99 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_BAD_FORMAT); | 99 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_BAD_FORMAT); |
100 | return NULL; | 100 | return nullptr; |
101 | } | 101 | } |
102 | 102 | ||
103 | load_savedata_sk = 1; | 103 | load_savedata_sk = 1; |
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); |
107 | return NULL; | 107 | return nullptr; |
108 | } | 108 | } |
109 | 109 | ||
110 | if (crypto_memcmp(tox_options_get_savedata_data(options), TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) == 0) { | 110 | if (crypto_memcmp(tox_options_get_savedata_data(options), TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) == 0) { |
111 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_ENCRYPTED); | 111 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_ENCRYPTED); |
112 | return NULL; | 112 | return nullptr; |
113 | } | 113 | } |
114 | 114 | ||
115 | load_savedata_tox = 1; | 115 | load_savedata_tox = 1; |
@@ -141,13 +141,13 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error) | |||
141 | 141 | ||
142 | default: | 142 | default: |
143 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_PROXY_BAD_TYPE); | 143 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_PROXY_BAD_TYPE); |
144 | return NULL; | 144 | return nullptr; |
145 | } | 145 | } |
146 | 146 | ||
147 | if (m_options.proxy_info.proxy_type != TCP_PROXY_NONE) { | 147 | if (m_options.proxy_info.proxy_type != TCP_PROXY_NONE) { |
148 | if (tox_options_get_proxy_port(options) == 0) { | 148 | if (tox_options_get_proxy_port(options) == 0) { |
149 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_PROXY_BAD_PORT); | 149 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_PROXY_BAD_PORT); |
150 | return NULL; | 150 | return nullptr; |
151 | } | 151 | } |
152 | 152 | ||
153 | ip_init(&m_options.proxy_info.ip_port.ip, m_options.ipv6enabled); | 153 | ip_init(&m_options.proxy_info.ip_port.ip, m_options.ipv6enabled); |
@@ -156,10 +156,10 @@ 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, NULL)) { | 159 | if (!addr_resolve_or_parse_ip(tox_options_get_proxy_host(options), &m_options.proxy_info.ip_port.ip, nullptr)) { |
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 NULL; | 162 | return nullptr; |
163 | } | 163 | } |
164 | 164 | ||
165 | m_options.proxy_info.ip_port.port = net_htons(tox_options_get_proxy_port(options)); | 165 | m_options.proxy_info.ip_port.port = net_htons(tox_options_get_proxy_port(options)); |
@@ -180,7 +180,7 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error) | |||
180 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_MALLOC); | 180 | SET_ERROR_PARAMETER(error, TOX_ERR_NEW_MALLOC); |
181 | } | 181 | } |
182 | 182 | ||
183 | return NULL; | 183 | return nullptr; |
184 | } | 184 | } |
185 | 185 | ||
186 | if (load_savedata_tox | 186 | if (load_savedata_tox |
@@ -198,7 +198,7 @@ Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error) | |||
198 | 198 | ||
199 | void tox_kill(Tox *tox) | 199 | void tox_kill(Tox *tox) |
200 | { | 200 | { |
201 | if (tox == NULL) { | 201 | if (tox == nullptr) { |
202 | return; | 202 | return; |
203 | } | 203 | } |
204 | 204 | ||