diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2016-08-05 14:38:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 14:38:41 -0700 |
| commit | 8353baab3d361bcdebb32f1677dd066e0b255dc9 (patch) | |
| tree | 38bd74dc119bdc115d5876383d7a65ff3e19debd /sesman/libscp/libscp_v1c.c | |
| parent | 81fe939dd346420d41eb2afcd6c8c05a422a9e7b (diff) | |
| parent | ace7d2c822937a9cb0637946f85d1fbd63562c44 (diff) | |
| download | xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.tar.gz xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.zip | |
Merge pull request #390 from proski/june21
Cleanups and C++ compatibility
Diffstat (limited to 'sesman/libscp/libscp_v1c.c')
| -rw-r--r-- | sesman/libscp/libscp_v1c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sesman/libscp/libscp_v1c.c b/sesman/libscp/libscp_v1c.c index 7d1b9db8..7bc9a1d3 100644 --- a/sesman/libscp/libscp_v1c.c +++ b/sesman/libscp/libscp_v1c.c @@ -224,7 +224,7 @@ scp_v1c_get_session_list(struct SCP_CONNECTION *c, int *scount, in_uint32_be(c->in_s, sescnt); sestmp = sescnt; - ds = g_malloc(sizeof(struct SCP_DISCONNECTED_SESSION) * sescnt, 0); + ds = g_new(struct SCP_DISCONNECTED_SESSION, sescnt); if (ds == 0) { @@ -429,7 +429,7 @@ _scp_v1c_check_response(struct SCP_CONNECTION *c, struct SCP_SESSION *s) g_free(s->errstr); } - s->errstr = g_malloc(dim + 1, 0); + s->errstr = g_new(char, dim + 1); if (s->errstr == 0) { @@ -450,7 +450,7 @@ _scp_v1c_check_response(struct SCP_CONNECTION *c, struct SCP_SESSION *s) g_free(s->errstr); } - s->errstr = g_malloc(dim + 1, 0); + s->errstr = g_new(char, dim + 1); if (s->errstr == 0) { @@ -471,7 +471,7 @@ _scp_v1c_check_response(struct SCP_CONNECTION *c, struct SCP_SESSION *s) g_free(s->errstr); } - s->errstr = g_malloc(dim + 1, 0); + s->errstr = g_new(char, dim + 1); if (s->errstr == 0) { |