From patchwork Wed Oct 21 15:41:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10184 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 86853BDB13 for ; Wed, 21 Oct 2020 15:42:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 418B960DF8; Wed, 21 Oct 2020 17:42:01 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Ma8hpaY1"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C306660C1F for ; Wed, 21 Oct 2020 17:41:55 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5781BAEE; Wed, 21 Oct 2020 17:41:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1603294915; bh=h8VyB8DvYvnofHdPfx6LBGktwsB0kHLx9SkL1idm+a0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ma8hpaY1xsperzdIYJ819d8qS3+UoKFhyR7fYYpbcgR67USkv0lAOQBZjb4QkxsXz I88ug2FXazAYyN8S/BaE/sgXB+QNkHfP3vJGsT6QTu0jwrTpVJuxTC3mIDjd7Wwkhq JTgzIYxhoNt1TjdFJJTEj5DKEhDldI8cV5lCk/gg= From: Kieran Bingham To: libcamera devel Date: Wed, 21 Oct 2020 16:41:40 +0100 Message-Id: <20201021154148.511505-8-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201021154148.511505-1-kieran.bingham@ideasonboard.com> References: <20201021154148.511505-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 07/15] android: camera_device: Use existing variable definitions X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Prevent variable shadowing by removing the redeclaration of variables with the same name (and type) where the existing variable can be reused. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index e9404c2f3004..5272b9ecded7 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1316,7 +1316,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) * the Android camera3_stream_t. */ for (CameraStream &cameraStream : streams_) { - int ret = cameraStream.configure(); + ret = cameraStream.configure(); if (ret) { LOG(HAL, Error) << "Failed to configure camera stream"; return ret;