From patchwork Wed Oct 10 13:04:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 1573621 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 4E98F40135 for ; Wed, 10 Oct 2012 13:08:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22B6F9EB67 for ; Wed, 10 Oct 2012 06:08:33 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 10 Oct 2012 06:04:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,564,1344236400"; d="scan'208";a="202780298" Received: from ideak-desk.fi.intel.com (HELO localhost) ([10.237.72.98]) by azsmga001.ch.intel.com with ESMTP; 10 Oct 2012 06:04:58 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Oct 2012 16:04:43 +0300 Message-Id: <1349874285-31536-7-git-send-email-imre.deak@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349874285-31536-1-git-send-email-imre.deak@intel.com> References: <1349874285-31536-1-git-send-email-imre.deak@intel.com> Subject: [Intel-gfx] [PATCH 6/8] fix warn in gem_reg_read: 'read' shadows a global declaration X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@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);