Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 307,
    "url": "https://patchwork.libcamera.org/api/patches/307/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/307/",
    "project": {
        "id": 1,
        "url": "https://patchwork.libcamera.org/api/projects/1/?format=api",
        "name": "libcamera",
        "link_name": "libcamera",
        "list_id": "libcamera_core",
        "list_email": "libcamera-devel@lists.libcamera.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": ""
    },
    "msgid": "<20190121172705.19985-7-jacopo@jmondi.org>",
    "date": "2019-01-21T17:27:05",
    "name": "[libcamera-devel,6/6] libcamera: Global s/devnode/deviceNode rename",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "76eb513ec840c3ce1c88fce1b0d153781d589798",
    "submitter": {
        "id": 3,
        "url": "https://patchwork.libcamera.org/api/people/3/?format=api",
        "name": "Jacopo Mondi",
        "email": "jacopo@jmondi.org"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/307/mbox/",
    "series": [
        {
            "id": 105,
            "url": "https://patchwork.libcamera.org/api/series/105/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=105",
            "date": "2019-01-21T17:26:59",
            "name": "libcamera: Augment V4L2 device",
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/105/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/307/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/307/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<jacopo@jmondi.org>",
        "Received": [
            "from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AC90460C97\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 21 Jan 2019 18:27:06 +0100 (CET)",
            "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 319E61BF20C;\n\tMon, 21 Jan 2019 17:27:06 +0000 (UTC)"
        ],
        "X-Originating-IP": "2.224.242.101",
        "From": "Jacopo Mondi <jacopo@jmondi.org>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Mon, 21 Jan 2019 18:27:05 +0100",
        "Message-Id": "<20190121172705.19985-7-jacopo@jmondi.org>",
        "X-Mailer": "git-send-email 2.20.1",
        "In-Reply-To": "<20190121172705.19985-1-jacopo@jmondi.org>",
        "References": "<20190121172705.19985-1-jacopo@jmondi.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH 6/6] libcamera: Global\n\ts/devnode/deviceNode rename",
        "X-BeenThere": "libcamera-devel@lists.libcamera.org",
        "X-Mailman-Version": "2.1.23",
        "Precedence": "list",
        "List-Id": "<libcamera-devel.lists.libcamera.org>",
        "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>",
        "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>",
        "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>",
        "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>",
        "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>",
        "X-List-Received-Date": "Mon, 21 Jan 2019 17:27:07 -0000"
    },
    "content": "Do not use the abreviated version for members, variables and getter\nmethods.\n\nLibrary-wise rename, no intended functional changes.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/include/media_device.h          |  6 +++---\n src/libcamera/include/media_object.h          |  6 +++---\n src/libcamera/include/v4l2_device.h           |  4 ++--\n src/libcamera/media_device.cpp                | 14 +++++++-------\n src/libcamera/media_object.cpp                | 14 +++++++-------\n src/libcamera/v4l2_device.cpp                 | 14 +++++++-------\n test/media_device/media_device_link_test.cpp  |  2 +-\n test/media_device/media_device_print_test.cpp | 12 ++++++------\n test/pipeline/ipu3/ipu3_pipeline_test.cpp     |  6 +++---\n 9 files changed, 39 insertions(+), 39 deletions(-)",
    "diff": "diff --git a/src/libcamera/include/media_device.h b/src/libcamera/include/media_device.h\nindex a8dec0d..ba3046d 100644\n--- a/src/libcamera/include/media_device.h\n+++ b/src/libcamera/include/media_device.h\n@@ -21,7 +21,7 @@ namespace libcamera {\n class MediaDevice\n {\n public:\n-\tMediaDevice(const std::string &devnode);\n+\tMediaDevice(const std::string &deviceNode);\n \t~MediaDevice();\n \n \tbool acquire();\n@@ -35,7 +35,7 @@ public:\n \tbool valid() const { return valid_; }\n \n \tconst std::string driver() const { return driver_; }\n-\tconst std::string devnode() const { return devnode_; }\n+\tconst std::string deviceNode() const { return deviceNode_; }\n \n \tconst std::vector<MediaEntity *> &entities() const { return entities_; }\n \tMediaEntity *getEntityByName(const std::string &name) const;\n@@ -49,7 +49,7 @@ public:\n \n private:\n \tstd::string driver_;\n-\tstd::string devnode_;\n+\tstd::string deviceNode_;\n \tint fd_;\n \tbool valid_;\n \tbool acquired_;\ndiff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h\nindex fad55a0..64095be 100644\n--- a/src/libcamera/include/media_object.h\n+++ b/src/libcamera/include/media_object.h\n@@ -85,7 +85,7 @@ class MediaEntity : public MediaObject\n public:\n \tconst std::string &name() const { return name_; }\n \tunsigned int function() const { return function_; }\n-\tconst std::string &devnode() const { return devnode_; }\n+\tconst std::string &deviceNode() const { return deviceNode_; }\n \tunsigned int deviceMajor() const { return major_; }\n \tunsigned int deviceMinor() const { return minor_; }\n \n@@ -94,7 +94,7 @@ public:\n \tconst MediaPad *getPadByIndex(unsigned int index) const;\n \tconst MediaPad *getPadById(unsigned int id) const;\n \n-\tint setDeviceNode(const std::string &devnode);\n+\tint setDeviceNode(const std::string &deviceNode);\n \n private:\n \tfriend class MediaDevice;\n@@ -106,7 +106,7 @@ private:\n \n \tstd::string name_;\n \tunsigned int function_;\n-\tstd::string devnode_;\n+\tstd::string deviceNode_;\n \tunsigned int major_;\n \tunsigned int minor_;\n \ndiff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\nindex 81992dc..ca4583c 100644\n--- a/src/libcamera/include/v4l2_device.h\n+++ b/src/libcamera/include/v4l2_device.h\n@@ -39,7 +39,7 @@ class MediaEntity;\n class V4L2Device\n {\n public:\n-\texplicit V4L2Device(const std::string &devnode);\n+\texplicit V4L2Device(const std::string &deviceNode);\n \texplicit V4L2Device(const MediaEntity &entity);\n \tV4L2Device(const V4L2Device &) = delete;\n \t~V4L2Device();\n@@ -89,7 +89,7 @@ private:\n \t\tint getFormat();\n \t};\n \n-\tstd::string devnode_;\n+\tstd::string deviceNode_;\n \tint fd_;\n \tV4L2Capability caps_;\n \tstd::unique_ptr<V4L2Format> format_;\ndiff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp\nindex 0ee5506..7cf4ce6 100644\n--- a/src/libcamera/media_device.cpp\n+++ b/src/libcamera/media_device.cpp\n@@ -61,13 +61,13 @@ namespace libcamera {\n \n /**\n  * \\brief Construct a MediaDevice\n- * \\param devnode The media device node path\n+ * \\param deviceNode The media device node path\n  *\n  * Once constructed the media device is invalid, and must be opened and\n  * populated with open() and populate() before the media graph can be queried.\n  */\n-MediaDevice::MediaDevice(const std::string &devnode)\n-\t: devnode_(devnode), fd_(-1), valid_(false), acquired_(false)\n+MediaDevice::MediaDevice(const std::string &deviceNode)\n+\t: deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false)\n {\n }\n \n@@ -143,10 +143,10 @@ int MediaDevice::open()\n \t\treturn -EBUSY;\n \t}\n \n-\tint ret = ::open(devnode_.c_str(), O_RDWR);\n+\tint ret = ::open(deviceNode_.c_str(), O_RDWR);\n \tif (ret < 0) {\n \t\tret = -errno;\n-\t\tLOG(Error) << \"Failed to open media device at \" << devnode_\n+\t\tLOG(Error) << \"Failed to open media device at \" << deviceNode_\n \t\t\t   << \": \" << strerror(-ret);\n \t\treturn ret;\n \t}\n@@ -280,9 +280,9 @@ int MediaDevice::populate()\n  */\n \n /**\n- * \\fn MediaDevice::devnode()\n+ * \\fn MediaDevice::deviceNode()\n  * \\brief Retrieve the media device device node path\n- * \\return The MediaDevice devnode path\n+ * \\return The MediaDevice deviceNode path\n  */\n \n /**\ndiff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp\nindex 7d07538..bda1e6c 100644\n--- a/src/libcamera/media_object.cpp\n+++ b/src/libcamera/media_object.cpp\n@@ -244,7 +244,7 @@ void MediaPad::addLink(MediaLink *link)\n  *\n  * In addition to their graph id, media graph entities are identified by a\n  * name() unique in the media device context. They implement a function() and\n- * may expose a devnode().\n+ * may expose a deviceNode().\n  */\n \n /**\n@@ -264,7 +264,7 @@ void MediaPad::addLink(MediaLink *link)\n  */\n \n /**\n- * \\fn MediaEntity::devnode()\n+ * \\fn MediaEntity::deviceNode()\n  * \\brief Retrieve the entity's device node path, if any\n  *\n  * \\sa int setDeviceNode()\n@@ -324,22 +324,22 @@ const MediaPad *MediaEntity::getPadById(unsigned int id) const\n \n /**\n  * \\brief Set the path to the device node for the associated interface\n- * \\param devnode The interface device node path associated with this entity\n+ * \\param deviceNode The interface device node path associated with this entity\n  * \\return 0 on success, or a negative error code if the device node can't be\n  * accessed\n  */\n-int MediaEntity::setDeviceNode(const std::string &devnode)\n+int MediaEntity::setDeviceNode(const std::string &deviceNode)\n {\n \t/* Make sure the device node can be accessed. */\n-\tint ret = ::access(devnode.c_str(), R_OK | W_OK);\n+\tint ret = ::access(deviceNode.c_str(), R_OK | W_OK);\n \tif (ret < 0) {\n \t\tret = -errno;\n-\t\tLOG(Error) << \"Device node \" << devnode << \" can't be accessed: \"\n+\t\tLOG(Error) << \"Device node \" << deviceNode << \" can't be accessed: \"\n \t\t\t   << strerror(-ret);\n \t\treturn ret;\n \t}\n \n-\tdevnode_ = devnode;\n+\tdeviceNode_ = deviceNode;\n \n \treturn 0;\n }\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 126f6f2..0e15f86 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -118,10 +118,10 @@ bool V4L2Capability::isOutput() const\n \n /**\n  * \\brief Construct a V4L2Device\n- * \\param devnode The file-system path to the video device node\n+ * \\param deviceNode The file-system path to the video device node\n  */\n-V4L2Device::V4L2Device(const std::string &devnode)\n-\t: devnode_(devnode), fd_(-1)\n+V4L2Device::V4L2Device(const std::string &deviceNode)\n+\t: deviceNode_(deviceNode), fd_(-1)\n {\n }\n \n@@ -132,7 +132,7 @@ V4L2Device::V4L2Device(const std::string &devnode)\n  * Construct a V4L2Device from a MediaEntity's device node path.\n  */\n V4L2Device::V4L2Device(const MediaEntity &entity)\n-\t: V4L2Device(entity.devnode())\n+\t: V4L2Device(entity.deviceNode())\n {\n }\n \n@@ -154,10 +154,10 @@ int V4L2Device::open()\n \t\treturn -EBUSY;\n \t}\n \n-\tret = ::open(devnode_.c_str(), O_RDWR);\n+\tret = ::open(deviceNode_.c_str(), O_RDWR);\n \tif (ret < 0) {\n \t\tret = -errno;\n-\t\tLOG(Error) << \"Failed to open V4L2 device '\" << devnode_\n+\t\tLOG(Error) << \"Failed to open V4L2 device '\" << deviceNode_\n \t\t\t   << \"': \" << strerror(-ret);\n \t\treturn ret;\n \t}\n@@ -171,7 +171,7 @@ int V4L2Device::open()\n \t\treturn ret;\n \t}\n \n-\tLOG(Debug) << \"Opened '\" << devnode_ << \"' \"\n+\tLOG(Debug) << \"Opened '\" << deviceNode_ << \"' \"\n \t\t   << caps_.bus_info() << \": \" << caps_.driver()\n \t\t   << \": \" << caps_.card();\n \ndiff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp\nindex 2297e33..ac5b632 100644\n--- a/test/media_device/media_device_link_test.cpp\n+++ b/test/media_device/media_device_link_test.cpp\n@@ -55,7 +55,7 @@ class MediaDeviceLinkTest : public Test\n \n \t\tif (dev_->open()) {\n \t\t\tcerr << \"Failed to open media device at \"\n-\t\t\t     << dev_->devnode() << endl;\n+\t\t\t     << dev_->deviceNode() << endl;\n \t\t\treturn TestFail;\n \t\t}\n \ndiff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp\nindex 13af722..3eef973 100644\n--- a/test/media_device/media_device_print_test.cpp\n+++ b/test/media_device/media_device_print_test.cpp\n@@ -35,7 +35,7 @@ protected:\n \tvoid cleanup() { }\n \n private:\n-\tint testMediaDevice(string devnode);\n+\tint testMediaDevice(string deviceNode);\n \n \tvoid printMediaGraph(const MediaDevice &media, ostream &os);\n \tvoid printLinkFlags(const MediaLink *link, ostream &os);\n@@ -68,7 +68,7 @@ void MediaDevicePrintTest::printLinkFlags(const MediaLink *link, ostream &os)\n  */\n void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os)\n {\n-\tos << \"\\n\" << media.driver() << \" - \" << media.devnode() << \"\\n\\n\";\n+\tos << \"\\n\" << media.driver() << \" - \" << media.deviceNode() << \"\\n\\n\";\n \n \tfor (auto const &entity : media.entities()) {\n \t\tos << \"\\\"\" << entity->name() << \"\\\"\\n\";\n@@ -108,9 +108,9 @@ void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os\n }\n \n /* Test a single media device. */\n-int MediaDevicePrintTest::testMediaDevice(const string devnode)\n+int MediaDevicePrintTest::testMediaDevice(const string deviceNode)\n {\n-\tMediaDevice dev(devnode);\n+\tMediaDevice dev(deviceNode);\n \tint ret;\n \n \t/* Fuzzy open/close sequence. */\n@@ -144,7 +144,7 @@ int MediaDevicePrintTest::testMediaDevice(const string devnode)\n #define MAX_MEDIA_DEV 256\n int MediaDevicePrintTest::run()\n {\n-\tconst string devnode(\"/dev/media\");\n+\tconst string deviceNode(\"/dev/media\");\n \tunsigned int i;\n \tint ret = 77; /* skip test exit code */\n \n@@ -153,7 +153,7 @@ int MediaDevicePrintTest::run()\n \t * system, if any.\n \t */\n \tfor (i = 0; i < MAX_MEDIA_DEV; i++) {\n-\t\tstring mediadev = devnode + to_string(i);\n+\t\tstring mediadev = deviceNode + to_string(i);\n \t\tstruct stat pstat = { };\n \n \t\tif (stat(mediadev.c_str(), &pstat))\ndiff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp\nindex deaee40..efe9eaf 100644\n--- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n+++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp\n@@ -45,7 +45,7 @@ private:\n \n int IPU3PipelineTest::init()\n {\n-\tconst string devnode(\"/dev/media\");\n+\tconst string deviceNode(\"/dev/media\");\n \tbool cio2 = false;\n \tbool imgu = false;\n \tunsigned int i;\n@@ -59,7 +59,7 @@ int IPU3PipelineTest::init()\n \t * as soon as we hit a non accessible media device.\n \t */\n \tfor (i = 0; i < 256; i++) {\n-\t\tstring mediadev = devnode + to_string(i);\n+\t\tstring mediadev = deviceNode + to_string(i);\n \t\tstruct stat pstat = { };\n \n \t\tif (stat(mediadev.c_str(), &pstat))\n@@ -82,7 +82,7 @@ int IPU3PipelineTest::init()\n \t\t\t */\n \t\t\tret = dev.populate();\n \t\t\tif (ret) {\n-\t\t\t\tcerr << \"Failed to populate media device \" << dev.devnode() << endl;\n+\t\t\t\tcerr << \"Failed to populate media device \" << dev.deviceNode() << endl;\n \t\t\t\treturn TestFail;\n \t\t\t}\n \n",
    "prefixes": [
        "libcamera-devel",
        "6/6"
    ]
}