{"id":2292,"url":"https://patchwork.libcamera.org/api/patches/2292/?format=json","web_url":"https://patchwork.libcamera.org/patch/2292/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191104170805.20647-1-laurent.pinchart@ideasonboard.com>","date":"2019-11-04T17:08:04","name":"[libcamera-devel,1/2] libcamera: Remove unneeded semicolons","commit_ref":"d312d0ba10f3740d45b50ef8bcfc48e751e694fc","pull_url":null,"state":"accepted","archived":false,"hash":"bd6fca7b944848b43f4e144c2904d95cef70a811","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2292/mbox/","series":[{"id":565,"url":"https://patchwork.libcamera.org/api/series/565/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=565","date":"2019-11-04T17:08:04","name":"[libcamera-devel,1/2] libcamera: Remove unneeded semicolons","version":1,"mbox":"https://patchwork.libcamera.org/series/565/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2292/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2292/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CF8AF6017A\n\tfor ;\n\tMon, 4 Nov 2019 18:08:20 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 405D552C\n\tfor ;\n\tMon, 4 Nov 2019 18:08:20 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1572887300;\n\tbh=lr6XMqYOa6UF7c4qSnmIQO5n6b69FLCq3h/NsPEBtno=;\n\th=From:To:Subject:Date:From;\n\tb=FrzbwjHygLmIN2Fe1v8IR0LAXp4lLmQCDF34kOS5ksAWyGkN/SO3AotZ/hpbx+8SU\n\ts5cXkVxmTMA3Yl3QKlA4FWvMKWmmApuSCv02nOWomXvJA333ncym8eAzdKRzPSybBC\n\tGgQXyKXQuV/uPcbTtamJpIgbxaL0EYxp+S543Klw=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 4 Nov 2019 19:08:04 +0200","Message-Id":"<20191104170805.20647-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.23.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/2] libcamera: Remove unneeded semicolons","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 04 Nov 2019 17:08:21 -0000"},"content":"Comply with the coding style by removing lots of unneeded semicolons.\nFix a few other coding style violations on the lines touched by those\nfixes.\n\nSigned-off-by: Laurent Pinchart \n---\n include/ipa/ipa_module_info.h | 4 ++--\n include/ipa/ipa_vimc.h | 2 +-\n include/libcamera/bound_method.h | 2 +-\n include/libcamera/object.h | 2 +-\n src/cam/event_loop.h | 2 +-\n src/cam/options.cpp | 2 +-\n src/ipa/ipa_vimc.cpp | 4 ++--\n src/ipa/rkisp1/rkisp1.cpp | 4 ++--\n src/libcamera/include/ipa_proxy.h | 2 +-\n src/libcamera/include/pipeline_handler.h | 2 +-\n src/libcamera/message.cpp | 2 +-\n src/libcamera/object.cpp | 2 +-\n src/libcamera/pipeline_handler.cpp | 2 +-\n src/libcamera/proxy/ipa_proxy_linux.cpp | 2 +-\n src/libcamera/thread.cpp | 2 +-\n test/camera/camera_test.cpp | 2 +-\n test/v4l2_subdevice/v4l2_subdevice_test.h | 4 +++-\n test/v4l2_videodevice/v4l2_videodevice_test.cpp | 2 +-\n 18 files changed, 23 insertions(+), 21 deletions(-)","diff":"diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h\nindex d9e33c1db1e4..7ecd149566be 100644\n--- a/include/ipa/ipa_module_info.h\n+++ b/include/ipa/ipa_module_info.h\n@@ -23,8 +23,8 @@ struct IPAModuleInfo {\n \n extern \"C\" {\n extern const struct IPAModuleInfo ipaModuleInfo;\n-};\n+}\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\n \n #endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */\ndiff --git a/include/ipa/ipa_vimc.h b/include/ipa/ipa_vimc.h\nindex 05b561d80047..9add122cf598 100644\n--- a/include/ipa/ipa_vimc.h\n+++ b/include/ipa/ipa_vimc.h\n@@ -17,6 +17,6 @@ enum IPAOperationCode {\n \tIPAOperationInit,\n };\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\n \n #endif /* __LIBCAMERA_IPA_VIMC_H__ */\ndiff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h\nindex bdeb5469cda3..b841a2aed147 100644\n--- a/include/libcamera/bound_method.h\n+++ b/include/libcamera/bound_method.h\n@@ -142,6 +142,6 @@ private:\n \tvoid (*func_)(Args...);\n };\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\n \n #endif /* __LIBCAMERA_BOUND_METHOD_H__ */\ndiff --git a/include/libcamera/object.h b/include/libcamera/object.h\nindex 91b56596c9db..86e0f7265865 100644\n--- a/include/libcamera/object.h\n+++ b/include/libcamera/object.h\n@@ -67,6 +67,6 @@ private:\n \tunsigned int pendingMessages_;\n };\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\n \n #endif /* __LIBCAMERA_OBJECT_H__ */\ndiff --git a/src/cam/event_loop.h b/src/cam/event_loop.h\nindex aaca5838f979..581c7cba2fc4 100644\n--- a/src/cam/event_loop.h\n+++ b/src/cam/event_loop.h\n@@ -13,7 +13,7 @@\n \n namespace libcamera {\n class EventDispatcher;\n-};\n+}\n \n class EventLoop\n {\ndiff --git a/src/cam/options.cpp b/src/cam/options.cpp\nindex 1f0631eccfba..7e2dfa636ccf 100644\n--- a/src/cam/options.cpp\n+++ b/src/cam/options.cpp\n@@ -490,7 +490,7 @@ void OptionsParser::usage()\n \t\t\telse\n \t\t\t\targument += \" \";\n \t\t\targument += std::string(\"--\") + option.name;\n-\t\t};\n+\t\t}\n \n \t\tif (option.argument != ArgumentNone) {\n \t\t\tif (option.argument == ArgumentOptional)\ndiff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp\nindex 63d578b4e2aa..9fd5212b0381 100644\n--- a/src/ipa/ipa_vimc.cpp\n+++ b/src/ipa/ipa_vimc.cpp\n@@ -112,6 +112,6 @@ IPAInterface *ipaCreate()\n {\n \treturn new IPAVimc();\n }\n-};\n+}\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 9a13f5c7df17..d741d5677d0e 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -251,6 +251,6 @@ IPAInterface *ipaCreate()\n {\n \treturn new IPARkISP1();\n }\n-};\n+}\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h\nindex 72216662e373..add40b4b3368 100644\n--- a/src/libcamera/include/ipa_proxy.h\n+++ b/src/libcamera/include/ipa_proxy.h\n@@ -36,7 +36,7 @@ class IPAProxyFactory\n {\n public:\n \tIPAProxyFactory(const char *name);\n-\tvirtual ~IPAProxyFactory(){};\n+\tvirtual ~IPAProxyFactory() {}\n \n \tvirtual std::unique_ptr create(IPAModule *ipam) = 0;\n \ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 42b90a4bf1a6..241af58beec0 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -111,7 +111,7 @@ class PipelineHandlerFactory\n {\n public:\n \tPipelineHandlerFactory(const char *name);\n-\tvirtual ~PipelineHandlerFactory() { };\n+\tvirtual ~PipelineHandlerFactory() {}\n \n \tstd::shared_ptr create(CameraManager *manager);\n \ndiff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp\nindex daf653221077..c547895362f3 100644\n--- a/src/libcamera/message.cpp\n+++ b/src/libcamera/message.cpp\n@@ -161,4 +161,4 @@ void InvokeMessage::invoke()\n * \\brief The packed method invocation arguments\n */\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp\nindex db2c6f68fbc8..1f787271f782 100644\n--- a/src/libcamera/object.cpp\n+++ b/src/libcamera/object.cpp\n@@ -223,4 +223,4 @@ void Object::disconnect(SignalBase *signal)\n \t}\n }\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex bf8c86d35c4f..884feaa6ecbd 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -135,7 +135,7 @@ PipelineHandler::~PipelineHandler()\n {\n \tfor (std::shared_ptr media : mediaDevices_)\n \t\tmedia->release();\n-};\n+}\n \n /**\n * \\fn PipelineHandler::match(DeviceEnumerator *enumerator)\ndiff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\nindex 4e6fa6899e07..27b6639d6312 100644\n--- a/src/libcamera/proxy/ipa_proxy_linux.cpp\n+++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n@@ -92,4 +92,4 @@ void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)\n \n REGISTER_IPA_PROXY(IPAProxyLinux)\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\nindex 872ad1bd9d69..e152af14631e 100644\n--- a/src/libcamera/thread.cpp\n+++ b/src/libcamera/thread.cpp\n@@ -495,4 +495,4 @@ void Thread::moveObject(Object *object, ThreadData *currentData,\n \t\tmoveObject(child, currentData, targetData);\n }\n \n-}; /* namespace libcamera */\n+} /* namespace libcamera */\ndiff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp\nindex 0e105414bf46..101e31fbce79 100644\n--- a/test/camera/camera_test.cpp\n+++ b/test/camera/camera_test.cpp\n@@ -45,4 +45,4 @@ void CameraTest::cleanup()\n \n \tcm_->stop();\n \tdelete cm_;\n-};\n+}\ndiff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h\nindex 96646a155536..3bce6691f8ef 100644\n--- a/test/v4l2_subdevice/v4l2_subdevice_test.h\n+++ b/test/v4l2_subdevice/v4l2_subdevice_test.h\n@@ -21,7 +21,9 @@ class V4L2SubdeviceTest : public Test\n {\n public:\n \tV4L2SubdeviceTest()\n-\t\t: scaler_(nullptr){};\n+\t\t: scaler_(nullptr)\n+\t{\n+\t}\n \n protected:\n \tint init() override;\ndiff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp\nindex 096f9649bfc9..577da4cb601c 100644\n--- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp\n+++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp\n@@ -99,4 +99,4 @@ void V4L2VideoDeviceTest::cleanup()\n \tdelete debayer_;\n \tdelete sensor_;\n \tdelete capture_;\n-};\n+}\n","prefixes":["libcamera-devel","1/2"]}