From 1af83ca6df779fc3c7f8f4fc48f3ca82d824987d Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Mon, 21 Jan 2019 17:53:28 +0100 Subject: libcamera: Global s/devnode/deviceNode rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not use the abreviated version for members, variables and getter methods. Library-wise rename, no intended functional changes. Reviewed-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Signed-off-by: Jacopo Mondi --- src/libcamera/media_object.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/libcamera/media_object.cpp') diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index a8d92e5f..baf9aeaa 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -246,7 +246,7 @@ void MediaPad::addLink(MediaLink *link) * * In addition to their graph id, media graph entities are identified by a * name() unique in the media device context. They implement a function() and - * may expose a devnode(). + * may expose a deviceNode(). */ /** @@ -266,7 +266,7 @@ void MediaPad::addLink(MediaLink *link) */ /** - * \fn MediaEntity::devnode() + * \fn MediaEntity::deviceNode() * \brief Retrieve the entity's device node path, if any * * \sa int setDeviceNode() @@ -326,23 +326,23 @@ const MediaPad *MediaEntity::getPadById(unsigned int id) const /** * \brief Set the path to the device node for the associated interface - * \param devnode The interface device node path associated with this entity + * \param deviceNode The interface device node path associated with this entity * \return 0 on success, or a negative error code if the device node can't be * accessed */ -int MediaEntity::setDeviceNode(const std::string &devnode) +int MediaEntity::setDeviceNode(const std::string &deviceNode) { /* Make sure the device node can be accessed. */ - int ret = ::access(devnode.c_str(), R_OK | W_OK); + int ret = ::access(deviceNode.c_str(), R_OK | W_OK); if (ret < 0) { ret = -errno; LOG(MediaDevice, Error) - << "Device node " << devnode << " can't be accessed: " + << "Device node " << deviceNode << " can't be accessed: " << strerror(-ret); return ret; } - devnode_ = devnode; + deviceNode_ = deviceNode; return 0; } -- cgit v1.2.1