From: Imre Deak Subject: [PATCH 6/8] fix warn in gem_reg_read: 'read' shadows a global declaration Date: Wed, 10 Oct 2012 16:04:43 +0300 Message-ID: <1349874285-31536-7-git-send-email-imre.deak@intel.com> References: <1349874285-31536-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id F23969E9CE for ; Wed, 10 Oct 2012 06:04:59 -0700 (PDT) In-Reply-To: <1349874285-31536-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Signed-off-by: Imre Deak --- tests/gem_reg_read.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/gem_reg_read.c b/tests/gem_reg_read.c index 1d6db1f..692dd98 100644 --- a/tests/gem_reg_read.c +++ b/tests/gem_reg_read.c @@ -52,29 +52,29 @@ static void handle_bad(int ret, int lerrno, int expected, const char *desc) static uint64_t timer_query(int fd) { - struct local_drm_i915_reg_read read; + struct local_drm_i915_reg_read reg_read; int ret; - read.offset = 0x2358; - ret = drmIoctl(fd, REG_READ_IOCTL, &read); + reg_read.offset = 0x2358; + ret = drmIoctl(fd, REG_READ_IOCTL, ®_read); if (ret) { perror("positive test case failed: "); exit(EXIT_FAILURE); } - return read.val; + return reg_read.val; } int main(int argc, char *argv[]) { - struct local_drm_i915_reg_read read; + struct local_drm_i915_reg_read reg_read; int ret, fd; uint64_t val; fd = drm_open_any(); - read.offset = 0x2358; - ret = drmIoctl(fd, REG_READ_IOCTL, &read); + reg_read.offset = 0x2358; + ret = drmIoctl(fd, REG_READ_IOCTL, ®_read); if (errno == EINVAL) exit(77); else if (ret) @@ -88,8 +88,8 @@ int main(int argc, char *argv[]) } /* bad reg */ - read.offset = 0x12345678; - ret = drmIoctl(fd, REG_READ_IOCTL, &read); + reg_read.offset = 0x12345678; + ret = drmIoctl(fd, REG_READ_IOCTL, ®_read); handle_bad(ret, errno, EINVAL, "bad register"); close(fd); -- 1.7.9.5