summaryrefslogtreecommitdiffstats
path: root/src/kiro-client.c
diff options
context:
space:
mode:
authorTimo Dritschler <timo.dritschler@kit.edu>2014-11-26 18:49:58 +0100
committerTimo Dritschler <timo.dritschler@kit.edu>2014-11-26 18:49:58 +0100
commit8df0836960547bbbf8e75a87efc45cd31d9f65c4 (patch)
tree0221e1a2b298a47e959905eaac00fadcb5f6490b /src/kiro-client.c
parent3dc2e76f0d6cf350f41c574726d354f1a81591a6 (diff)
parentfcec7a701ef599c432f29f13ce82bfdb464d7ee7 (diff)
downloadkiro-8df0836960547bbbf8e75a87efc45cd31d9f65c4.tar.gz
kiro-8df0836960547bbbf8e75a87efc45cd31d9f65c4.tar.bz2
kiro-8df0836960547bbbf8e75a87efc45cd31d9f65c4.tar.xz
kiro-8df0836960547bbbf8e75a87efc45cd31d9f65c4.zip
Merge branch 'master' into eventLoops
Diffstat (limited to 'src/kiro-client.c')
-rw-r--r--src/kiro-client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kiro-client.c b/src/kiro-client.c
index 06026eb..57dbea2 100644
--- a/src/kiro-client.c
+++ b/src/kiro-client.c
@@ -197,7 +197,7 @@ kiro_client_connect (KiroClient *self, const char *address, const char *port)
}
g_debug ("Route to server resolved");
- struct kiro_connection_context *ctx = (struct kiro_connection_context *)calloc (1, sizeof (struct kiro_connection_context));
+ struct kiro_connection_context *ctx = (struct kiro_connection_context *)g_try_malloc (sizeof (struct kiro_connection_context));
if (!ctx) {
g_critical ("Failed to create connection context (Out of memory?)");