OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vnc: add missing static

Browse Source 
Add missing 'static' qualifiers.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Blue Swirl 2012-10-28 11:04:48 +00:00 committed by Stefan Hajnoczi
parent 4fdcac0e2b
commit 71a8cdeca0
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console.h
View File

@ -377,10 +377,8 @@ void cocoa_display_init(DisplayState *ds, int full_screen);
/* vnc.c */ /* vnc.c */
void vnc_display_init(DisplayState *ds); void vnc_display_init(DisplayState *ds);
void vnc_display_close(DisplayState *ds);
void vnc_display_open(DisplayState *ds, const char *display, Error **errp); void vnc_display_open(DisplayState *ds, const char *display, Error **errp);
void vnc_display_add_client(DisplayState *ds, int csock, int skipauth); void vnc_display_add_client(DisplayState *ds, int csock, int skipauth);
int vnc_display_disable_login(DisplayState *ds);
char *vnc_display_local_addr(DisplayState *ds); char *vnc_display_local_addr(DisplayState *ds);
#ifdef CONFIG_VNC #ifdef CONFIG_VNC
int vnc_display_password(DisplayState *ds, const char *password); int vnc_display_password(DisplayState *ds, const char *password);

10
ui/vnc-jobs.c
View File

@ -320,6 +320,11 @@ static void *vnc_worker_thread(void *arg)
return NULL; return NULL;
} }
static bool vnc_worker_thread_running(void)
{
return queue; /* Check global queue */
}
void vnc_start_worker_thread(void) void vnc_start_worker_thread(void)
{ {
VncJobQueue *q; VncJobQueue *q;
@ -332,11 +337,6 @@ void vnc_start_worker_thread(void)
queue = q; /* Set global queue */ queue = q; /* Set global queue */
} }
bool vnc_worker_thread_running(void)
{
return queue; /* Check global queue */
}
void vnc_stop_worker_thread(void) void vnc_stop_worker_thread(void)
{ {
if (!vnc_worker_thread_running()) if (!vnc_worker_thread_running())

1
ui/vnc-jobs.h
View File

@ -40,7 +40,6 @@ void vnc_jobs_join(VncState *vs);
void vnc_jobs_consume_buffer(VncState *vs); void vnc_jobs_consume_buffer(VncState *vs);
void vnc_start_worker_thread(void); void vnc_start_worker_thread(void);
bool vnc_worker_thread_running(void);
void vnc_stop_worker_thread(void); void vnc_stop_worker_thread(void);
/* Locks */ /* Locks */

14
ui/vnc.c
View File

@ -479,12 +479,12 @@ void buffer_reserve(Buffer *buffer, size_t len)
} }
} }
int buffer_empty(Buffer *buffer) static int buffer_empty(Buffer *buffer)
{ {
return buffer->offset == 0; return buffer->offset == 0;
} }
uint8_t *buffer_end(Buffer *buffer) static uint8_t *buffer_end(Buffer *buffer)
{ {
return buffer->buffer + buffer->offset; return buffer->buffer + buffer->offset;
} }
@ -1376,17 +1376,17 @@ void vnc_flush(VncState *vs)
vnc_unlock_output(vs); vnc_unlock_output(vs);
} }
uint8_t read_u8(uint8_t *data, size_t offset) static uint8_t read_u8(uint8_t *data, size_t offset)
{ {
return data[offset]; return data[offset];
} }
uint16_t read_u16(uint8_t *data, size_t offset) static uint16_t read_u16(uint8_t *data, size_t offset)
{ {
return ((data[offset] & 0xFF) << 8) | (data[offset + 1] & 0xFF); return ((data[offset] & 0xFF) << 8) | (data[offset + 1] & 0xFF);
} }
int32_t read_s32(uint8_t *data, size_t offset) static int32_t read_s32(uint8_t *data, size_t offset)
{ {
return (int32_t)((data[offset] << 24) | (data[offset + 1] << 16) | return (int32_t)((data[offset] << 24) | (data[offset + 1] << 16) |
(data[offset + 2] << 8) | data[offset + 3]); (data[offset + 2] << 8) | data[offset + 3]);
@ -2763,7 +2763,7 @@ void vnc_display_init(DisplayState *ds)
} }
void vnc_display_close(DisplayState *ds) static void vnc_display_close(DisplayState *ds)
{ {
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@ -2785,7 +2785,7 @@ void vnc_display_close(DisplayState *ds)
#endif #endif
} }
int vnc_display_disable_login(DisplayState *ds) static int vnc_display_disable_login(DisplayState *ds)
{ {
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;

5
ui/vnc.h
View File

@ -493,9 +493,6 @@ void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting);
/* Buffer I/O functions */ /* Buffer I/O functions */
uint8_t read_u8(uint8_t *data, size_t offset);
uint16_t read_u16(uint8_t *data, size_t offset);
int32_t read_s32(uint8_t *data, size_t offset);
uint32_t read_u32(uint8_t *data, size_t offset); uint32_t read_u32(uint8_t *data, size_t offset);
/* Protocol stage functions */ /* Protocol stage functions */
@ -507,8 +504,6 @@ void start_auth_vnc(VncState *vs);
/* Buffer management */ /* Buffer management */
void buffer_reserve(Buffer *buffer, size_t len); void buffer_reserve(Buffer *buffer, size_t len);
int buffer_empty(Buffer *buffer);
uint8_t *buffer_end(Buffer *buffer);
void buffer_reset(Buffer *buffer); void buffer_reset(Buffer *buffer);
void buffer_free(Buffer *buffer); void buffer_free(Buffer *buffer);
void buffer_append(Buffer *buffer, const void *data, size_t len); void buffer_append(Buffer *buffer, const void *data, size_t len);