flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 09:56:22 +00:00
Code Issues Releases Wiki Activity

fix warn in gem_reg_read: 'read' shadows a global declaration

Browse Source 
Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Imre Deak 2012-10-10 16:04:43 +03:00 committed by Daniel Vetter
parent 3a622b9784
commit bcfc0f1e4b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/gem_reg_read.c
View File

@ -52,29 +52,29 @@ static void handle_bad(int ret, int lerrno, int expected, const char *desc)
static uint64_t timer_query(int fd) static uint64_t timer_query(int fd)
{ {
struct local_drm_i915_reg_read read; struct local_drm_i915_reg_read reg_read;
int ret; int ret;
read.offset = 0x2358; reg_read.offset = 0x2358;
ret = drmIoctl(fd, REG_READ_IOCTL, &read); ret = drmIoctl(fd, REG_READ_IOCTL, &reg_read);
if (ret) { if (ret) {
perror("positive test case failed: "); perror("positive test case failed: ");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
return read.val; return reg_read.val;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct local_drm_i915_reg_read read; struct local_drm_i915_reg_read reg_read;
int ret, fd; int ret, fd;
uint64_t val; uint64_t val;
fd = drm_open_any(); fd = drm_open_any();
read.offset = 0x2358; reg_read.offset = 0x2358;
ret = drmIoctl(fd, REG_READ_IOCTL, &read); ret = drmIoctl(fd, REG_READ_IOCTL, &reg_read);
if (errno == EINVAL) if (errno == EINVAL)
exit(77); exit(77);
else if (ret) else if (ret)
@ -88,8 +88,8 @@ int main(int argc, char *argv[])
} }
/* bad reg */ /* bad reg */
read.offset = 0x12345678; reg_read.offset = 0x12345678;
ret = drmIoctl(fd, REG_READ_IOCTL, &read); ret = drmIoctl(fd, REG_READ_IOCTL, &reg_read);
handle_bad(ret, errno, EINVAL, "bad register"); handle_bad(ret, errno, EINVAL, "bad register");
close(fd); close(fd);