diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-02-19 09:36:31 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-02-20 09:15:01 +0000 |
| commit | aaafccbc7d2e8d463c2bffc6eeb8371401e3e60a (patch) | |
| tree | 10360e1b0d30f388a2d65a8c773e8340abe441a9 /tests/syncobj_wait.c | |
| parent | ca045978faecc2604126a8dcdddaf6aaf0b5fdd7 (diff) | |
igt/syncobj: Tidy ye olde compiler warnings
syncobj_basic.c: In function ‘__real_main225’:
syncobj_basic.c:202:26: warning: ‘fd’ may be used uninitialized in this function [-Wmaybe-uninitialized]
syncobj_basic.c:227:6: note: ‘fd’ was declared here
syncobj_wait.c: In function ‘test_wait_complex’:
syncobj_wait.c:702:3: warning: ‘first_signaled’ may be used uninitialized in this function [-Wmaybe-uninitialized]
syncobj_wait.c: In function ‘__real_main758’:
syncobj_wait.c:492:24: warning: ‘timeline’ may be used uninitialized in this function [-Wmaybe-uninitialized]
syncobj_wait.c:473:15: note: ‘timeline’ was declared here
syncobj_wait.c:326:23: warning: ‘timeline’ may be used uninitialized in this function [-Wmaybe-uninitialized]
syncobj_wait.c:320:6: note: ‘timeline’ was declared here
syncobj_wait.c:406:31: warning: ‘fd’ may be used uninitialized in this function [-Wmaybe-uninitialized]
syncobj_wait.c:760:6: note: ‘fd’ was declared here
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'tests/syncobj_wait.c')
| -rw-r--r-- | tests/syncobj_wait.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/syncobj_wait.c b/tests/syncobj_wait.c index 49e6d372..04d79de7 100644 --- a/tests/syncobj_wait.c +++ b/tests/syncobj_wait.c @@ -317,7 +317,7 @@ test_single_wait(int fd, uint32_t test_flags, int expect) { uint32_t syncobj = syncobj_create(fd, 0); uint32_t flags = flags_for_test_flags(test_flags); - int timeline; + int timeline = -1; if (test_flags & (WAIT_SUBMITTED | WAIT_SIGNALED)) timeline = syncobj_attach_sw_sync(fd, syncobj); @@ -336,6 +336,8 @@ test_single_wait(int fd, uint32_t test_flags, int expect) } syncobj_destroy(fd, syncobj); + if (timeline != -1) + close(timeline); } static void @@ -343,7 +345,7 @@ test_wait_delayed_signal(int fd, uint32_t test_flags) { uint32_t syncobj = syncobj_create(fd, 0); uint32_t flags = flags_for_test_flags(test_flags); - int timeline; + int timeline = -1; timer_t timer; if (test_flags & WAIT_FOR_SUBMIT) { @@ -360,7 +362,7 @@ test_wait_delayed_signal(int fd, uint32_t test_flags) timer_delete(timer); - if (!(test_flags & WAIT_FOR_SUBMIT)) + if (timeline != -1) close(timeline); syncobj_destroy(fd, syncobj); @@ -614,7 +616,7 @@ test_wait_complex(int fd, uint32_t test_flags) uint32_t syncobjs[8]; enum syncobj_stage stage[8]; int i, j, timelines[8]; - uint32_t first_signaled, num_signaled; + uint32_t first_signaled = -1, num_signaled = 0; pthread_t thread; for (i = 0; i < 8; i++) { @@ -757,7 +759,7 @@ has_syncobj_wait(int fd) igt_main { - int fd; + int fd = -1; igt_fixture { fd = drm_open_driver(DRIVER_ANY); |