From patchwork Mon Nov 4 17:08:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2293 Return-Path: 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 110B861374 for ; Mon, 4 Nov 2019 18:08:21 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8DF69A3B for ; Mon, 4 Nov 2019 18:08:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1572887300; bh=09r4WI+WSC0HcD5xFhuJOckJjzQDUlKKXCweu/b1e2U=; h=From:To:Subject:Date:In-Reply-To:References:From; b=WZB3QfEoQN9hkunkvDDbz4z10DWyRPnHQCzHtJ+INkFdyt2kC0jIKSI6Si+GTwhR/ QSpzlCry6x3yUqu4gTdpoS+5CFqz9gBuLGHZA30ldUwllPO6mLyTuNGzk7XhJRZYqR GLUd53RjFYwp02RBOW4eL+BA4oGP6CB9O65uf42A= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 4 Nov 2019 19:08:05 +0200 Message-Id: <20191104170805.20647-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104170805.20647-1-laurent.pinchart@ideasonboard.com> References: <20191104170805.20647-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] libcamera: Remove space between empty curly brackets 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: , X-List-Received-Date: Mon, 04 Nov 2019 17:08:21 -0000 Remove spaces between empty curly brackets (replacing { } with {}) to comply with the coding style. Fix one other coding style violation on the lines touched by those fixes. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/include/media_object.h | 10 ++++++---- src/libcamera/media_device.cpp | 4 ++-- src/libcamera/message.cpp | 2 +- test/libtest/test.h | 2 +- test/media_device/media_device_print_test.cpp | 8 ++++---- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h index 2a3ffc06c876..748eafdc880b 100644 --- a/src/libcamera/include/media_object.h +++ b/src/libcamera/include/media_object.h @@ -27,9 +27,11 @@ public: protected: friend class MediaDevice; - MediaObject(MediaDevice *dev, unsigned int id) : - dev_(dev), id_(id) { } - virtual ~MediaObject() { } + MediaObject(MediaDevice *dev, unsigned int id) + : dev_(dev), id_(id) + { + } + virtual ~MediaObject() {} MediaDevice *dev_; unsigned int id_; @@ -49,7 +51,7 @@ private: MediaLink(const struct media_v2_link *link, MediaPad *source, MediaPad *sink); MediaLink(const MediaLink &) = delete; - ~MediaLink() { } + ~MediaLink() {} MediaPad *source_; MediaPad *sink_; diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 0d6630fbd1f4..e1ae34f88455 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -199,7 +199,7 @@ void MediaDevice::unlock() */ int MediaDevice::populate() { - struct media_v2_topology topology = { }; + struct media_v2_topology topology = {}; struct media_v2_entity *ents = nullptr; struct media_v2_interface *interfaces = nullptr; struct media_v2_link *links = nullptr; @@ -767,7 +767,7 @@ void MediaDevice::fixupEntityFlags(struct media_v2_entity *entity) */ int MediaDevice::setupLink(const MediaLink *link, unsigned int flags) { - struct media_link_desc linkDesc = { }; + struct media_link_desc linkDesc = {}; MediaPad *source = link->source(); MediaPad *sink = link->sink(); diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp index c547895362f3..c35bb33dfeda 100644 --- a/src/libcamera/message.cpp +++ b/src/libcamera/message.cpp @@ -93,7 +93,7 @@ Message::~Message() * class MyCustomMessage : public Message * { * public: - * MyCustomMessage() : Message(type()) { } + * MyCustomMessage() : Message(type()) {} * * static Message::Type type() * { diff --git a/test/libtest/test.h b/test/libtest/test.h index ec08bf97c03d..26d4b94bc12d 100644 --- a/test/libtest/test.h +++ b/test/libtest/test.h @@ -26,7 +26,7 @@ public: protected: virtual int init() { return 0; } virtual int run() = 0; - virtual void cleanup() { } + virtual void cleanup() {} }; #define TEST_REGISTER(klass) \ diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp index 8dd8a151266d..5018906c75e7 100644 --- a/test/media_device/media_device_print_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -26,13 +26,13 @@ using namespace std; class MediaDevicePrintTest : public Test { public: - MediaDevicePrintTest() { } - ~MediaDevicePrintTest() { } + MediaDevicePrintTest() {} + ~MediaDevicePrintTest() {} protected: int init() { return 0; } int run(); - void cleanup() { } + void cleanup() {} private: int testMediaDevice(string deviceNode); @@ -137,7 +137,7 @@ int MediaDevicePrintTest::run() */ for (i = 0; i < MAX_MEDIA_DEV; i++) { string mediadev = deviceNode + to_string(i); - struct stat pstat = { }; + struct stat pstat = {}; if (stat(mediadev.c_str(), &pstat)) continue;