diff options
| author | Christophe Fergeau <cfergeau@gmail.com> | 2011-03-21 13:38:19 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2011-04-08 12:14:19 +0200 |
| commit | 3ba093a57e5283b3b630a30182cb770e62fc93a9 (patch) | |
| tree | 1cfec1df2ad5a5bee7b200ebdb48ed66e9749e59 /server/tests | |
| parent | bb9b8a3c1330411288ae32b0419b816434e487fa (diff) | |
| download | spice-3ba093a57e5283b3b630a30182cb770e62fc93a9.tar.gz spice-3ba093a57e5283b3b630a30182cb770e62fc93a9.tar.xz spice-3ba093a57e5283b3b630a30182cb770e62fc93a9.zip | |
tests: fix compilation with -Wall -Werror
When compiling spice with make CFLAGS="-g3 -ggdb3 -O0 -Wall -Werror",
the build broken because of a few unused variables/missing returns.
This patch fixes these warnings.
Diffstat (limited to 'server/tests')
| -rw-r--r-- | server/tests/basic_event_loop.c | 2 | ||||
| -rw-r--r-- | server/tests/test_display_base.c | 5 | ||||
| -rw-r--r-- | server/tests/test_empty_success.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/server/tests/basic_event_loop.c b/server/tests/basic_event_loop.c index 7e8a1df4..2fe1b69c 100644 --- a/server/tests/basic_event_loop.c +++ b/server/tests/basic_event_loop.c @@ -319,7 +319,7 @@ void basic_event_loop_mainloop(void) if ((next_timer = get_next_timer()) != NULL) { calc_next_timeout(next_timer, &next_timer_timeout); timeout = &next_timer_timeout; - DPRINTF(1, "timeout of %d.%06d", + DPRINTF(1, "timeout of %zd.%06zd", timeout->tv_sec, timeout->tv_usec); } else { timeout = NULL; diff --git a/server/tests/test_display_base.c b/server/tests/test_display_base.c index c87d2c7f..104ab37e 100644 --- a/server/tests/test_display_base.c +++ b/server/tests/test_display_base.c @@ -40,7 +40,6 @@ static void test_spice_destroy_update(SimpleSpiceUpdate *update) #define SINGLE_PART 8 static const int angle_parts = 64 / SINGLE_PART; -static int angle = 0; static int unique = 1; static int color = -1; static int c_i = 0; @@ -354,7 +353,6 @@ static int num_simple_commands = 0; static void produce_command() { static int target_surface = 0; - static int simple_command_index = 0; static int cmd_index = 0; ASSERT(num_simple_commands); @@ -449,6 +447,7 @@ static struct { uint8_t data[CURSOR_WIDTH * CURSOR_HEIGHT * 4]; // 32bit per pixel } cursor; +#if 0 static void init_cursor() { cursor.cursor.header.unique = 0; // TODO ?? @@ -461,6 +460,7 @@ static void init_cursor() cursor.cursor.chunk.data_size = cursor.cursor.data_size; cursor.cursor.chunk.prev_chunk = cursor.cursor.chunk.next_chunk = 0; } +#endif static int get_cursor_command(QXLInstance *qin, struct QXLCommandExt *ext) { @@ -515,6 +515,7 @@ static void notify_update(QXLInstance *qin, uint32_t update_id) static int flush_resources(QXLInstance *qin) { printf("%s\n", __func__); + return TRUE; } QXLInterface display_sif = { diff --git a/server/tests/test_empty_success.c b/server/tests/test_empty_success.c index e747e403..97aa7726 100644 --- a/server/tests/test_empty_success.c +++ b/server/tests/test_empty_success.c @@ -1,8 +1,10 @@ +#include <stdlib.h> #include <strings.h> #include <spice.h> SpiceTimer* timer_add(SpiceTimerFunc func, void *opaque) { + return NULL; } void timer_start(SpiceTimer *timer, uint32_t ms) @@ -19,6 +21,7 @@ void timer_remove(SpiceTimer *timer) SpiceWatch *watch_add(int fd, int event_mask, SpiceWatchFunc func, void *opaque) { + return NULL; } void watch_update_mask(SpiceWatch *watch, int event_mask) |