diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-01-10 15:50:20 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-01-10 15:50:20 +0100 |
commit | a7a80c2c2f7ac15ae50d75dc2fcaf59834b47e0c (patch) | |
tree | cebf294d83ee69299634f4ca855eaa3a4d73ae39 /tests/gem_mmap.c | |
parent | bd5cf9a07d17ce91dfaa3aa12d3f2c93815f0489 (diff) |
tests: fixup new warnings
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/gem_mmap.c')
-rw-r--r-- | tests/gem_mmap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c index 5730f7ec..f251d899 100644 --- a/tests/gem_mmap.c +++ b/tests/gem_mmap.c @@ -46,7 +46,7 @@ int main(int argc, char **argv) { int fd; struct drm_i915_gem_create create; - struct drm_i915_gem_mmap mmap; + struct drm_i915_gem_mmap gem_mmap; struct drm_gem_close unref; uint8_t expected[OBJECT_SIZE]; uint8_t buf[OBJECT_SIZE]; @@ -56,12 +56,12 @@ int main(int argc, char **argv) fd = drm_open_any(); - memset(&mmap, 0, sizeof(mmap)); - mmap.handle = 0x10101010; - mmap.offset = 0; - mmap.size = 4096; + memset(&gem_mmap, 0, sizeof(gem_mmap)); + gem_mmap.handle = 0x10101010; + gem_mmap.offset = 0; + gem_mmap.size = 4096; printf("Testing mmaping of bad object.\n"); - ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap); + ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &gem_mmap); assert(ret == -1 && errno == ENOENT); memset(&create, 0, sizeof(create)); @@ -71,12 +71,12 @@ int main(int argc, char **argv) handle = create.handle; printf("Testing mmaping of newly created object.\n"); - mmap.handle = handle; - mmap.offset = 0; - mmap.size = OBJECT_SIZE; - ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap); + gem_mmap.handle = handle; + gem_mmap.offset = 0; + gem_mmap.size = OBJECT_SIZE; + ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &gem_mmap); assert(ret == 0); - addr = (uint8_t *)(uintptr_t)mmap.addr_ptr; + addr = (uint8_t *)(uintptr_t)gem_mmap.addr_ptr; printf("Testing contents of newly created object.\n"); memset(expected, 0, sizeof(expected)); |