diff options
author | iphydf <iphydf@users.noreply.github.com> | 2016-09-05 16:10:48 +0100 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2016-09-06 11:54:37 +0100 |
commit | ad2656051697899e960694bb68ac104fcc5e92f1 (patch) | |
tree | 7e69fcd03db88b3839ee523f5d1b51ef9a38c372 /toxcore/group.c | |
parent | 4e6c86d1cb228308678f89ff6e4e09b3f46347aa (diff) |
Improve static and const correctness.
- Any non-externally-visible declarations should be `static`.
- Casting away the `const` qualifier from pointers-to-const is
dangerous. All but one instance of this are now correct. The one
instance where we can't keep `const` is one where toxav code actually
writes to a chunk of memory marked as `const`. This code also assumes
4 byte alignment of data packets. I don't know whether that is a valid
assumption, but it's likely unportable, and *not* obviously correct.
- Replaced empty parameter lists with `(void)` to avoid passing
parameters to it. Empty parameter lists are old style declarations for
unknown number and type of arguments.
- Commented out (as `#if DHT_HARDENING` block) the hardening code that
was never executed.
- Minor style fix: don't use `default` in enum-switches unless the number
of enumerators in the default case is very large. In this case, it was
2, so we want to list them both explicitly to be warned about missing
one if we add one in the future.
- Removed the only two function declarations from nTox.h and put them
into nTox.c. They are not used outside and nTox is not a library.
Diffstat (limited to 'toxcore/group.c')
-rw-r--r-- | toxcore/group.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toxcore/group.c b/toxcore/group.c index f1086657..dbfb31cd 100644 --- a/toxcore/group.c +++ b/toxcore/group.c | |||
@@ -1188,7 +1188,7 @@ static unsigned int send_message_group(const Group_Chats *g_c, int groupnumber, | |||
1188 | uint16_t len); | 1188 | uint16_t len); |
1189 | 1189 | ||
1190 | #define GROUP_MESSAGE_PING_ID 0 | 1190 | #define GROUP_MESSAGE_PING_ID 0 |
1191 | int group_ping_send(const Group_Chats *g_c, int groupnumber) | 1191 | static int group_ping_send(const Group_Chats *g_c, int groupnumber) |
1192 | { | 1192 | { |
1193 | if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_PING_ID, 0, 0)) { | 1193 | if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_PING_ID, 0, 0)) { |
1194 | return 0; | 1194 | return 0; |
@@ -1203,8 +1203,8 @@ int group_ping_send(const Group_Chats *g_c, int groupnumber) | |||
1203 | * return 0 on success | 1203 | * return 0 on success |
1204 | * return -1 on failure | 1204 | * return -1 on failure |
1205 | */ | 1205 | */ |
1206 | int group_new_peer_send(const Group_Chats *g_c, int groupnumber, uint16_t peer_num, const uint8_t *real_pk, | 1206 | static int group_new_peer_send(const Group_Chats *g_c, int groupnumber, uint16_t peer_num, const uint8_t *real_pk, |
1207 | uint8_t *temp_pk) | 1207 | uint8_t *temp_pk) |
1208 | { | 1208 | { |
1209 | uint8_t packet[GROUP_MESSAGE_NEW_PEER_LENGTH]; | 1209 | uint8_t packet[GROUP_MESSAGE_NEW_PEER_LENGTH]; |
1210 | 1210 | ||