maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-170: Merge client args default change.

Browse Source
This commit is contained in:
James Muehlner 2017-01-24 11:44:40 -08:00
commit 8cd98b5298
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libguac/client.c
View File

@ -41,6 +41,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
/**
* Empty NULL-terminated array of argument names.
*/
const char* __GUAC_CLIENT_NO_ARGS[] = { NULL };
guac_layer __GUAC_DEFAULT_LAYER = { guac_layer __GUAC_DEFAULT_LAYER = {
.index = 0 .index = 0
}; };
@ -399,6 +404,7 @@ guac_client* guac_client_alloc() {
/* Init new client */ /* Init new client */
memset(client, 0, sizeof(guac_client)); memset(client, 0, sizeof(guac_client));
client->args = __GUAC_CLIENT_NO_ARGS;
client->state = GUAC_CLIENT_RUNNING; client->state = GUAC_CLIENT_RUNNING;
client->last_sent_timestamp = guac_timestamp_current(); 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) { int guac_client_load_plugin(guac_client* client, const char* protocol) {
/* Reference to dlopen()'d plugin */ /* Reference to dlopen()'d plugin */
@ -730,7 +731,6 @@ int guac_client_load_plugin(guac_client* client, const char* protocol) {
} }
/* Init client */ /* Init client */
client->args = __GUAC_CLIENT_NO_ARGS;
client->__plugin_handle = client_plugin_handle; client->__plugin_handle = client_plugin_handle;
return alias.client_init(client); return alias.client_init(client);