From patchwork Wed Jun 26 17:35:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 1523 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5EF9B6157F for ; Wed, 26 Jun 2019 19:36:15 +0200 (CEST) X-Halon-ID: c932bbaa-9838-11e9-8ab4-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [145.14.112.32]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id c932bbaa-9838-11e9-8ab4-005056917a89; Wed, 26 Jun 2019 19:35:34 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 26 Jun 2019 19:35:43 +0200 Message-Id: <20190626173543.2257-1-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: v4l2_device: Fix variable-sized object initialization X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jun 2019 17:36:15 -0000 Compiling with clang renders errors as a variable-sized arrays are not allowed to be initialized, solve this by using memset() instead. ../../src/libcamera/v4l2_device.cpp:155:37: error: variable-sized object may not be initialized const V4L2ControlInfo *controlInfo[count] = {}; ^~~~~ ../../src/libcamera/v4l2_device.cpp:156:36: error: variable-sized object may not be initialized struct v4l2_ext_control v4l2Ctrls[count] = {}; ^~~~~ ../../src/libcamera/v4l2_device.cpp:227:37: error: variable-sized object may not be initialized const V4L2ControlInfo *controlInfo[count] = {}; ^~~~~ ../../src/libcamera/v4l2_device.cpp:228:36: error: variable-sized object may not be initialized struct v4l2_ext_control v4l2Ctrls[count] = {}; ^~~~~ Fixes: eb068f4e67eedacd ("libcamera: v4l2_device: Implement get and set controls") Signed-off-by: Niklas Söderlund --- src/libcamera/v4l2_device.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 84758a811c271976..d730df78e1ab2478 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -152,8 +152,11 @@ int V4L2Device::getControls(V4L2ControlList *ctrls) if (count == 0) return 0; - const V4L2ControlInfo *controlInfo[count] = {}; - struct v4l2_ext_control v4l2Ctrls[count] = {}; + const V4L2ControlInfo *controlInfo[count]; + struct v4l2_ext_control v4l2Ctrls[count]; + memset(controlInfo, 0, count * sizeof(controlInfo[0])); + memset(v4l2Ctrls, 0, count * sizeof(v4l2Ctrls[0])); + for (unsigned int i = 0; i < count; ++i) { const V4L2Control *ctrl = ctrls->getByIndex(i); const V4L2ControlInfo *info = getControlInfo(ctrl->id()); @@ -224,8 +227,10 @@ int V4L2Device::setControls(V4L2ControlList *ctrls) if (count == 0) return 0; - const V4L2ControlInfo *controlInfo[count] = {}; - struct v4l2_ext_control v4l2Ctrls[count] = {}; + const V4L2ControlInfo *controlInfo[count]; + struct v4l2_ext_control v4l2Ctrls[count]; + memset(controlInfo, 0, count * sizeof(controlInfo[0])); + memset(v4l2Ctrls, 0, count * sizeof(v4l2Ctrls[0])); for (unsigned int i = 0; i < count; ++i) { const V4L2Control *ctrl = ctrls->getByIndex(i);