[libcamera-devel] [PATCH 3/3] libcamera: v4l2_videodevice: Use FileDescriptor "fd move" constructor

Niklas Söderlund niklas.soderlund at ragnatech.se
Tue May 19 15:44:57 CEST 2020


Hi Laurent,

Thanks for your work.

On 2020-05-18 19:48:04 +0300, Laurent Pinchart wrote:
> Use the newly added "fd move" constructor of the FileDescriptor class to
> avoid dup() + close().
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

> ---
>  src/libcamera/v4l2_videodevice.cpp | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp
> index fbe55bc6f54f..3614b2ed1cbc 100644
> --- a/src/libcamera/v4l2_videodevice.cpp
> +++ b/src/libcamera/v4l2_videodevice.cpp
> @@ -1276,14 +1276,7 @@ FileDescriptor V4L2VideoDevice::exportDmabufFd(unsigned int index,
>  		return FileDescriptor();
>  	}
>  
> -	FileDescriptor fd(expbuf.fd);
> -	/*
> -	 * FileDescriptor takes a duplicate of fd, so we must close the
> -	 * original here, otherwise it will be left dangling.
> -	 */
> -	::close(expbuf.fd);
> -
> -	return fd;
> +	return FileDescriptor(std::move(expbuf.fd));
>  }
>  
>  /**
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

-- 
Regards,
Niklas Söderlund


More information about the libcamera-devel mailing list