safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove -O2, check rfbInitClient return value, provide return value in client init

Browse Source
This commit is contained in:
Michael Jumper
2010-09-20 18:13:32 -07:00
parent 72277b50aa
commit 79fabff39d
7 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/libguac/Makefile
View File

@@ -1,5 +1,5 @@
CFLAGS+=-O2 -fPIC -pedantic -Wall -Werror -Iinclude
CFLAGS+= -fPIC -pedantic -Wall -Werror -Iinclude
LDFLAGS=-lpng -luuid
.PHONY: clean doc

4
guacamole/libguac/client.c
View File

@@ -104,7 +104,9 @@ guac_client* guac_get_client(int client_fd, guac_client_registry* registry, guac
guac_flush(client->io);
}
client_init(client, argc, scratch_argv);
if (client_init(client, argc, scratch_argv) != 0)
return NULL;
break;
}

12
guacamole/libguac/include/client.h
View File

@@ -79,7 +79,7 @@ struct guac_client {
* @code
* void handle_messages(guac_client* client);
*
* void guac_client_init(guac_client* client, int argc, char** argv) {
* int guac_client_init(guac_client* client, int argc, char** argv) {
* client->handle_messages = handle_messages;
* }
* @endcode
@@ -106,7 +106,7 @@ struct guac_client {
* @code
* void mouse_handler(guac_client* client, int x, int y, int button_mask);
*
* void guac_client_init(guac_client* client, int argc, char** argv) {
* int guac_client_init(guac_client* client, int argc, char** argv) {
* client->mouse_handler = mouse_handler;
* }
* @endcode
@@ -124,7 +124,7 @@ struct guac_client {
* @code
* void key_handler(guac_client* client, int keysym, int pressed);
*
* void guac_client_init(guac_client* client, int argc, char** argv) {
* int guac_client_init(guac_client* client, int argc, char** argv) {
* client->key_handler = key_handler;
* }
* @endcode
@@ -145,7 +145,7 @@ struct guac_client {
* @code
* void clipboard_handler(guac_client* client, char* copied);
*
* void guac_client_init(guac_client* client, int argc, char** argv) {
* int guac_client_init(guac_client* client, int argc, char** argv) {
* client->clipboard_handler = clipboard_handler;
* }
* @endcode
@@ -165,7 +165,7 @@ struct guac_client {
* @code
* void free_handler(guac_client* client);
*
* void guac_client_init(guac_client* client, int argc, char** argv) {
* int guac_client_init(guac_client* client, int argc, char** argv) {
* client->free_handler = free_handler;
* }
* @endcode
@@ -174,7 +174,7 @@ struct guac_client {
};
typedef void guac_client_init_handler(guac_client* client, int argc, char** argv);
typedef int guac_client_init_handler(guac_client* client, int argc, char** argv);
/**
* Initialize and return a new guac_client using the specified client init handler (guac_client_init_handler).