{"id":3855,"url":"https://patchwork.libcamera.org/api/1.1/patches/3855/?format=json","web_url":"https://patchwork.libcamera.org/patch/3855/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200526032635.13599-1-laurent.pinchart@ideasonboard.com>","date":"2020-05-26T03:26:35","name":"[libcamera-devel] libcamera: Declare functions before variables in class definitions","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4c808723388aca510967095b9d844776094da56c","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3855/mbox/","series":[{"id":927,"url":"https://patchwork.libcamera.org/api/1.1/series/927/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=927","date":"2020-05-26T03:26:35","name":"[libcamera-devel] libcamera: Declare functions before variables in class definitions","version":1,"mbox":"https://patchwork.libcamera.org/series/927/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3855/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3855/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 28BC1603CF\n\tfor ;\n\tTue, 26 May 2020 05:26:53 +0200 (CEST)","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 9993F562\n\tfor ;\n\tTue, 26 May 2020 05:26:52 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"nDi0iG23\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1590463612;\n\tbh=dhJ+DsgAsSfbNoL1stDRvqbaSIuruV0KXcgXman1Y2U=;\n\th=From:To:Subject:Date:From;\n\tb=nDi0iG23FzWqDJW4FPqvemkXPpSF6nRYEgryua+WOr7cYj/LfobHfnTzJhpltucQw\n\t8f8iZfvQrO1TtxH7dNlekMgn1C7q/t9Ziac5yZiQ3OM9/vN8DFkBgEXmbYU5epELWL\n\t0yBGSIffTXHKIj7xzXZMo8+b7J7nPXegcpb2VJ+M=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 May 2020 06:26:35 +0300","Message-Id":"<20200526032635.13599-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.26.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: Declare functions before\n\tvariables in class definitions","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":"Tue, 26 May 2020 03:26:53 -0000"},"content":"The preferred coding style in libcamera is to declare private functions\nbefore private variables in class definitions. This rule isn't followed\nby some of the internal classes. Update them accordingly.\n\nSigned-off-by: Laurent Pinchart \n---\n .../internal/device_enumerator_udev.h | 16 ++++++------\n .../internal/event_dispatcher_poll.h | 12 ++++-----\n include/libcamera/internal/ipa_manager.h | 4 +--\n include/libcamera/internal/ipa_module.h | 4 +--\n include/libcamera/internal/media_device.h | 26 +++++++++----------\n include/libcamera/internal/media_object.h | 4 +--\n 6 files changed, 33 insertions(+), 33 deletions(-)","diff":"diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h\nindex fdaa20968ef0..10d17ed2abac 100644\n--- a/include/libcamera/internal/device_enumerator_udev.h\n+++ b/include/libcamera/internal/device_enumerator_udev.h\n@@ -36,10 +36,6 @@ public:\n \tint enumerate() final;\n \n private:\n-\tstruct udev *udev_;\n-\tstruct udev_monitor *monitor_;\n-\tEventNotifier *notifier_;\n-\n \tusing DependencyMap = std::map>;\n \n \tstruct MediaDeviceDeps {\n@@ -58,16 +54,20 @@ private:\n \t\tDependencyMap deps_;\n \t};\n \n-\tstd::set orphans_;\n-\tstd::list pending_;\n-\tstd::map devMap_;\n-\n \tint addUdevDevice(struct udev_device *dev);\n \tint populateMediaDevice(MediaDevice *media, DependencyMap *deps);\n \tstd::string lookupDeviceNode(dev_t devnum);\n \n \tint addV4L2Device(dev_t devnum);\n \tvoid udevNotify(EventNotifier *notifier);\n+\n+\tstruct udev *udev_;\n+\tstruct udev_monitor *monitor_;\n+\tEventNotifier *notifier_;\n+\n+\tstd::set orphans_;\n+\tstd::list pending_;\n+\tstd::map devMap_;\n };\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h\nindex 1f0738617425..3c9099660c4d 100644\n--- a/include/libcamera/internal/event_dispatcher_poll.h\n+++ b/include/libcamera/internal/event_dispatcher_poll.h\n@@ -41,16 +41,16 @@ private:\n \t\tEventNotifier *notifiers[3];\n \t};\n \n-\tstd::map notifiers_;\n-\tstd::list timers_;\n-\tint eventfd_;\n-\n-\tbool processingEvents_;\n-\n \tint poll(std::vector *pollfds);\n \tvoid processInterrupt(const struct pollfd &pfd);\n \tvoid processNotifiers(const std::vector &pollfds);\n \tvoid processTimers();\n+\n+\tstd::map notifiers_;\n+\tstd::list timers_;\n+\tint eventfd_;\n+\n+\tbool processingEvents_;\n };\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\nindex 2412d75746ac..16d742918cf2 100644\n--- a/include/libcamera/internal/ipa_manager.h\n+++ b/include/libcamera/internal/ipa_manager.h\n@@ -29,8 +29,6 @@ public:\n \t\t\t\t\t uint32_t minVersion);\n \n private:\n-\tstd::vector modules_;\n-\n \tIPAManager();\n \t~IPAManager();\n \n@@ -40,6 +38,8 @@ private:\n \n \tbool isSignatureValid(IPAModule *ipa) const;\n \n+\tstd::vector modules_;\n+\n #if HAVE_IPA_PUBKEY\n \tstatic const uint8_t publicKeyData_[];\n \tstatic const PubKey pubKey_;\ndiff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h\nindex 5b54cb31a48a..788e31d8bf03 100644\n--- a/include/libcamera/internal/ipa_module.h\n+++ b/include/libcamera/internal/ipa_module.h\n@@ -42,6 +42,8 @@ protected:\n \tstd::string logPrefix() const override;\n \n private:\n+\tint loadIPAModuleInfo();\n+\n \tstruct IPAModuleInfo info_;\n \tstd::vector signature_;\n \n@@ -52,8 +54,6 @@ private:\n \tvoid *dlHandle_;\n \ttypedef struct ipa_context *(*IPAIntfFactory)(void);\n \tIPAIntfFactory ipaCreate_;\n-\n-\tint loadIPAModuleInfo();\n };\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h\nindex 9fe76c514b17..19af059d9291 100644\n--- a/include/libcamera/internal/media_device.h\n+++ b/include/libcamera/internal/media_device.h\n@@ -58,26 +58,13 @@ protected:\n \tstd::string logPrefix() const;\n \n private:\n-\tstd::string driver_;\n-\tstd::string deviceNode_;\n-\tstd::string model_;\n-\tunsigned int version_;\n-\n-\tint fd_;\n-\tbool valid_;\n-\tbool acquired_;\n-\tbool lockOwner_;\n-\n \tint open();\n \tvoid close();\n \n-\tstd::map objects_;\n \tMediaObject *object(unsigned int id);\n \tbool addObject(MediaObject *object);\n \tvoid clear();\n \n-\tstd::vector entities_;\n-\n \tstruct media_v2_interface *findInterface(const struct media_v2_topology &topology,\n \t\t\t\t\t\t unsigned int entityId);\n \tbool populateEntities(const struct media_v2_topology &topology);\n@@ -87,6 +74,19 @@ private:\n \n \tfriend int MediaLink::setEnabled(bool enable);\n \tint setupLink(const MediaLink *link, unsigned int flags);\n+\n+\tstd::string driver_;\n+\tstd::string deviceNode_;\n+\tstd::string model_;\n+\tunsigned int version_;\n+\n+\tint fd_;\n+\tbool valid_;\n+\tbool acquired_;\n+\tbool lockOwner_;\n+\n+\tstd::map objects_;\n+\tstd::vector entities_;\n };\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h\nindex 748eafdc880b..e8f2f27ce99e 100644\n--- a/include/libcamera/internal/media_object.h\n+++ b/include/libcamera/internal/media_object.h\n@@ -107,6 +107,8 @@ private:\n \tMediaEntity(const MediaEntity &) = delete;\n \t~MediaEntity();\n \n+\tvoid addPad(MediaPad *pad);\n+\n \tstd::string name_;\n \tunsigned int function_;\n \tunsigned int flags_;\n@@ -115,8 +117,6 @@ private:\n \tunsigned int minor_;\n \n \tstd::vector pads_;\n-\n-\tvoid addPad(MediaPad *pad);\n };\n \n } /* namespace libcamera */\n","prefixes":["libcamera-devel"]}