diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-10-28 11:04:48 +0000 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2012-11-01 19:49:45 +0100 |
commit | 71a8cdeca095acb2a67924de870f4ee8da5b8803 (patch) | |
tree | 5272370e999f5077d0b3adc5bf2bc01286bc76b0 | |
parent | 4fdcac0e2b102c8017cf81eb6dfb3e5e1c490949 (diff) | |
download | qemu-71a8cdeca095acb2a67924de870f4ee8da5b8803.zip qemu-71a8cdeca095acb2a67924de870f4ee8da5b8803.tar.gz qemu-71a8cdeca095acb2a67924de870f4ee8da5b8803.tar.bz2 |
vnc: add missing static
Add missing 'static' qualifiers.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r-- | console.h | 2 | ||||
-rw-r--r-- | ui/vnc-jobs.c | 10 | ||||
-rw-r--r-- | ui/vnc-jobs.h | 1 | ||||
-rw-r--r-- | ui/vnc.c | 14 | ||||
-rw-r--r-- | ui/vnc.h | 5 |
5 files changed, 12 insertions, 20 deletions
@@ -377,10 +377,8 @@ void cocoa_display_init(DisplayState *ds, int full_screen); /* vnc.c */ 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_add_client(DisplayState *ds, int csock, int skipauth); -int vnc_display_disable_login(DisplayState *ds); char *vnc_display_local_addr(DisplayState *ds); #ifdef CONFIG_VNC int vnc_display_password(DisplayState *ds, const char *password); diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index 3c592b3..dfe482d 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -320,6 +320,11 @@ static void *vnc_worker_thread(void *arg) return NULL; } +static bool vnc_worker_thread_running(void) +{ + return queue; /* Check global queue */ +} + void vnc_start_worker_thread(void) { VncJobQueue *q; @@ -332,11 +337,6 @@ void vnc_start_worker_thread(void) queue = q; /* Set global queue */ } -bool vnc_worker_thread_running(void) -{ - return queue; /* Check global queue */ -} - void vnc_stop_worker_thread(void) { if (!vnc_worker_thread_running()) diff --git a/ui/vnc-jobs.h b/ui/vnc-jobs.h index 86e6d88..31da103 100644 --- a/ui/vnc-jobs.h +++ b/ui/vnc-jobs.h @@ -40,7 +40,6 @@ void vnc_jobs_join(VncState *vs); void vnc_jobs_consume_buffer(VncState *vs); void vnc_start_worker_thread(void); -bool vnc_worker_thread_running(void); void vnc_stop_worker_thread(void); /* Locks */ @@ -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; } -uint8_t *buffer_end(Buffer *buffer) +static uint8_t *buffer_end(Buffer *buffer) { return buffer->buffer + buffer->offset; } @@ -1376,17 +1376,17 @@ void vnc_flush(VncState *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]; } -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); } -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) | (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; @@ -2785,7 +2785,7 @@ void vnc_display_close(DisplayState *ds) #endif } -int vnc_display_disable_login(DisplayState *ds) +static int vnc_display_disable_login(DisplayState *ds) { VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; @@ -493,9 +493,6 @@ void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting); /* 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); /* Protocol stage functions */ @@ -507,8 +504,6 @@ void start_auth_vnc(VncState *vs); /* Buffer management */ 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_free(Buffer *buffer); void buffer_append(Buffer *buffer, const void *data, size_t len); |