Repository: incubator-guacamole-server Updated Branches: refs/heads/master 52ccd276d -> 8cd98b529
GUACAMOLE-170: Init guac_client args by default. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/9d2bb31a Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/9d2bb31a Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/9d2bb31a Branch: refs/heads/master Commit: 9d2bb31a9d7f2c7ed697d5650a20e04a765807c8 Parents: 0ef87c4 Author: Michael Jumper <[email protected]> Authored: Sun Sep 11 13:56:26 2016 -0700 Committer: Michael Jumper <[email protected]> Committed: Mon Jan 23 23:35:16 2017 -0800 ---------------------------------------------------------------------- src/libguac/client.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/9d2bb31a/src/libguac/client.c ---------------------------------------------------------------------- diff --git a/src/libguac/client.c b/src/libguac/client.c index b9862a1..2bf5471 100644 --- a/src/libguac/client.c +++ b/src/libguac/client.c @@ -41,6 +41,11 @@ #include <stdlib.h> #include <string.h> +/** + * Empty NULL-terminated array of argument names. + */ +const char* __GUAC_CLIENT_NO_ARGS[] = { NULL }; + guac_layer __GUAC_DEFAULT_LAYER = { .index = 0 }; @@ -399,6 +404,7 @@ guac_client* guac_client_alloc() { /* Init new client */ memset(client, 0, sizeof(guac_client)); + client->args = __GUAC_CLIENT_NO_ARGS; client->state = GUAC_CLIENT_RUNNING; client->last_sent_timestamp = guac_timestamp_current(); @@ -683,11 +689,6 @@ int guac_client_end_frame(guac_client* client) { } -/** - * Empty NULL-terminated array of argument names. - */ -const char* __GUAC_CLIENT_NO_ARGS[] = { NULL }; - int guac_client_load_plugin(guac_client* client, const char* protocol) { /* Reference to dlopen()'d plugin */ @@ -730,7 +731,6 @@ int guac_client_load_plugin(guac_client* client, const char* protocol) { } /* Init client */ - client->args = __GUAC_CLIENT_NO_ARGS; client->__plugin_handle = client_plugin_handle; return alias.client_init(client);
