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

Mark internal structs as private.

Browse Source
This commit is contained in:
Michael Jumper 2012-12-01 19:39:22 -08:00
parent df06d1a354
commit 5232056a1b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libguac/src/socket-fd.c
View File

@ -56,16 +56,16 @@
#include "socket.h" #include "socket.h"
#include "error.h" #include "error.h"
typedef struct guac_socket_fd_data { typedef struct __guac_socket_fd_data {
int fd; int fd;
} guac_socket_fd_data; } __guac_socket_fd_data;
ssize_t __guac_socket_fd_read_handler(guac_socket* socket, ssize_t __guac_socket_fd_read_handler(guac_socket* socket,
void* buf, size_t count) { void* buf, size_t count) {
guac_socket_fd_data* data = (guac_socket_fd_data*) socket->data; __guac_socket_fd_data* data = (__guac_socket_fd_data*) socket->data;
/* Read from socket */ /* Read from socket */
int retval = read(data->fd, buf, count); int retval = read(data->fd, buf, count);
@ -83,7 +83,7 @@ ssize_t __guac_socket_fd_read_handler(guac_socket* socket,
ssize_t __guac_socket_fd_write_handler(guac_socket* socket, ssize_t __guac_socket_fd_write_handler(guac_socket* socket,
void* buf, size_t count) { void* buf, size_t count) {
guac_socket_fd_data* data = (guac_socket_fd_data*) socket->data; __guac_socket_fd_data* data = (__guac_socket_fd_data*) socket->data;
int retval; int retval;
#ifdef __MINGW32__ #ifdef __MINGW32__
@ -106,7 +106,7 @@ ssize_t __guac_socket_fd_write_handler(guac_socket* socket,
int __guac_socket_fd_select_handler(guac_socket* socket, int usec_timeout) { int __guac_socket_fd_select_handler(guac_socket* socket, int usec_timeout) {
guac_socket_fd_data* data = (guac_socket_fd_data*) socket->data; __guac_socket_fd_data* data = (__guac_socket_fd_data*) socket->data;
fd_set fds; fd_set fds;
struct timeval timeout; struct timeval timeout;
@ -146,7 +146,7 @@ guac_socket* guac_socket_open(int fd) {
/* Allocate socket and associated data */ /* Allocate socket and associated data */
guac_socket* socket = guac_socket_alloc(); guac_socket* socket = guac_socket_alloc();
guac_socket_fd_data* data = malloc(sizeof(guac_socket_fd_data)); __guac_socket_fd_data* data = malloc(sizeof(__guac_socket_fd_data));
/* Store file descriptor as socket data */ /* Store file descriptor as socket data */
data->fd = fd; data->fd = fd;

8
libguac/src/socket-nest.c
View File

@ -60,18 +60,18 @@
#define GUAC_SOCKET_NEST_BUFFER_SIZE 8192 #define GUAC_SOCKET_NEST_BUFFER_SIZE 8192
typedef struct guac_socket_nest_data { typedef struct __guac_socket_nest_data {
guac_socket* parent; guac_socket* parent;
char buffer[GUAC_SOCKET_NEST_BUFFER_SIZE]; char buffer[GUAC_SOCKET_NEST_BUFFER_SIZE];
int index; int index;
} guac_socket_nest_data; } __guac_socket_nest_data;
ssize_t __guac_socket_nest_write_handler(guac_socket* socket, ssize_t __guac_socket_nest_write_handler(guac_socket* socket,
void* buf, size_t count) { void* buf, size_t count) {
guac_socket_nest_data* data = (guac_socket_nest_data*) socket->data; __guac_socket_nest_data* data = (__guac_socket_nest_data*) socket->data;
unsigned char* source = (unsigned char*) buf; unsigned char* source = (unsigned char*) buf;
/* Current location in destination buffer during copy */ /* Current location in destination buffer during copy */
@ -137,7 +137,7 @@ guac_socket* guac_socket_nest(guac_socket* parent, int index) {
/* Allocate socket and associated data */ /* Allocate socket and associated data */
guac_socket* socket = guac_socket_alloc(); guac_socket* socket = guac_socket_alloc();
guac_socket_nest_data* data = malloc(sizeof(guac_socket_nest_data)); __guac_socket_nest_data* data = malloc(sizeof(__guac_socket_nest_data));
/* Store file descriptor as socket data */ /* Store file descriptor as socket data */
data->parent = parent; data->parent = parent;