[libcamera-devel] [PATCH] libcamera: media_object: Rename major/minor functions

[Laurent Pinchart]

Hi Kieran,

Thank you for the patch.

On Monday, 7 January 2019 19:09:02 EET Kieran Bingham wrote:
> The system libraries define macro's for major/minor through
> <sys/types.h> on some versions of GCC/GLibc.
> 
> To prevent namespace collisions with these macros, rename our major and
> minor device node accessors.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> ---
>  src/libcamera/device_enumerator.cpp  | 4 ++--
>  src/libcamera/include/media_object.h | 4 ++--

No documentation update ? Apart from that,

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/device_enumerator.cpp
> b/src/libcamera/device_enumerator.cpp index 7ad1c501ff3d..c088f3e5d243
> 100644
> --- a/src/libcamera/device_enumerator.cpp
> +++ b/src/libcamera/device_enumerator.cpp
> @@ -208,10 +208,10 @@ int DeviceEnumerator::addDevice(const std::string
> &devnode)
> 
>  	/* Associate entities to device node paths. */
>  	for (MediaEntity *entity : media->entities()) {
> -		if (entity->major() == 0 && entity->minor() == 0)
> +		if (entity->deviceMajor() == 0 && entity->deviceMinor() == 0)
>  			continue;
> 
> -		std::string devnode = lookupDevnode(entity->major(), entity->minor());
> +		std::string devnode = lookupDevnode(entity->deviceMajor(),
> entity->deviceMinor());
>  		if (devnode.empty())
>  			return -EINVAL;
> 
> diff --git a/src/libcamera/include/media_object.h
> b/src/libcamera/include/media_object.h index 950a33286690..04b9a8909465
> 100644
> --- a/src/libcamera/include/media_object.h
> +++ b/src/libcamera/include/media_object.h
> @@ -80,8 +80,8 @@ class MediaEntity : public MediaObject
>  {
>  public:
>  	const std::string &name() const { return name_; }
> -	unsigned int major() const { return major_; }
> -	unsigned int minor() const { return minor_; }
> +	unsigned int deviceMajor() const { return major_; }
> +	unsigned int deviceMinor() const { return minor_; }
> 
>  	const std::vector<MediaPad *> &pads() const { return pads_; }

-- 
Regards,

Laurent Pinchart