projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove useless if's around free() calls.
[umurmur.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index 579a1b66ed1f694223f4805cbd897e4cc99791ac..1aea8e2fb5fadb32a66014f1182c761f2f84c875 100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-224,8
+224,7
@@
void recheckCodecVersions(client_t *connectingClient)
}
}
if (!found) {
}
}
if (!found) {
- cd = Memory_safeMalloc(1, sizeof(codec_t));
- memset(cd, 0, sizeof(codec_t));
+ cd = Memory_safeCalloc(1, sizeof(codec_t));
init_list_entry(&cd->node);
cd->codec = codec_itr->codec;
cd->count = 1;
init_list_entry(&cd->node);
cd->codec = codec_itr->codec;
cd->count = 1;
@@
-400,16
+399,12
@@
void Client_free(client_t *client)
SSLi_free(client->ssl);
close(client->tcpfd);
clientcount--;
SSLi_free(client->ssl);
close(client->tcpfd);
clientcount--;
- if (client->release)
- free(client->release);
- if (client->os)
- free(client->os);
- if (client->os_version)
- free(client->os_version);
- if (client->username)
- free(client->username);
- if (client->context)
- free(client->context);
+
+ free(client->release);
+ free(client->os);
+ free(client->os_version);
+ free(client->username);
+ free(client->context);
free(client);
if (authenticatedLeft)
free(client);
if (authenticatedLeft)