From patchwork Wed Oct 10 13:04:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 1573601 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 80D6FDFB34 for ; Wed, 10 Oct 2012 13:07:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 560129EB5E for ; Wed, 10 Oct 2012 06:07:42 -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 F0F0A9E8FD for ; Wed, 10 Oct 2012 06:04:55 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 10 Oct 2012 06:04:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,564,1344236400"; d="scan'208";a="202780274" 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:54 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Oct 2012 16:04:41 +0300 Message-Id: <1349874285-31536-5-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 4/8] fix warn in gem_readwrite: 'read/write' 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_readwrite.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/gem_readwrite.c b/tests/gem_readwrite.c index 68c3ff2..d3d69e3 100644 --- a/tests/gem_readwrite.c +++ b/tests/gem_readwrite.c @@ -44,34 +44,34 @@ static int do_read(int fd, int handle, void *buf, int offset, int size) { - struct drm_i915_gem_pread read; + struct drm_i915_gem_pread gem_pread; /* Ensure that we don't have any convenient data in buf in case * we fail. */ memset(buf, 0xd0, size); - memset(&read, 0, sizeof(read)); - read.handle = handle; - read.data_ptr = (uintptr_t)buf; - read.size = size; - read.offset = offset; + memset(&gem_pread, 0, sizeof(gem_pread)); + gem_pread.handle = handle; + gem_pread.data_ptr = (uintptr_t)buf; + gem_pread.size = size; + gem_pread.offset = offset; - return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &read); + return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &gem_pread); } static int do_write(int fd, int handle, void *buf, int offset, int size) { - struct drm_i915_gem_pwrite write; + struct drm_i915_gem_pwrite gem_pwrite; - memset(&write, 0, sizeof(write)); - write.handle = handle; - write.data_ptr = (uintptr_t)buf; - write.size = size; - write.offset = offset; + memset(&gem_pwrite, 0, sizeof(gem_pwrite)); + gem_pwrite.handle = handle; + gem_pwrite.data_ptr = (uintptr_t)buf; + gem_pwrite.size = size; + gem_pwrite.offset = offset; - return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &write); + return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &gem_pwrite); } int main(int argc, char **argv)