aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authornicm <nicm>2021-01-18 11:14:23 +0000
committernicm <nicm>2021-01-18 11:14:23 +0000
commit0730dce5abf5e43f8e3820a1d4e8754e61874a3d (patch)
tree9a56fc2720dea5dc75eb93ed0c37a413a932b301 /server-client.c
parent91d112bf12789da07e25ed001f7961b1d6bd7a76 (diff)
downloadrtmux-0730dce5abf5e43f8e3820a1d4e8754e61874a3d.tar.gz
rtmux-0730dce5abf5e43f8e3820a1d4e8754e61874a3d.tar.bz2
rtmux-0730dce5abf5e43f8e3820a1d4e8754e61874a3d.zip
Hide some warnings on newer GCC versions, GitHUb issue 2525.
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c
index f85304a6..a55188d1 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1781,11 +1781,11 @@ server_client_check_exit(struct client *c)
switch (c->exit_type) {
case CLIENT_EXIT_RETURN:
- if (c->exit_message != NULL) {
+ if (c->exit_message != NULL)
msize = strlen(c->exit_message) + 1;
- size = (sizeof c->retval) + msize;
- } else
- size = (sizeof c->retval);
+ else
+ msize = 0;
+ size = (sizeof c->retval) + msize;
data = xmalloc(size);
memcpy(data, &c->retval, sizeof c->retval);
if (c->exit_message != NULL)