[libcamera-devel] android: Fix unused parameter warnings on Chrome OS
diff mbox series

Message ID 20210531225328.7595-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit a931188e1de2c7663ff6c516141eb714c2a5dd8e
Headers show
Series
  • [libcamera-devel] android: Fix unused parameter warnings on Chrome OS
Related show

Commit Message

Laurent Pinchart May 31, 2021, 10:53 p.m. UTC 
The Chrome OS-specific code has multiple function parameters that are
not used. This results in compilation warnings. Fix them with
[[maybe_unused]].

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Change-Id: I4f05ace5c1781b2593e80532553b6a02e399fed6
---
 src/android/cros/camera3_hal.cpp      | 2 +-
 src/android/mm/cros_camera_buffer.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

Comments

Laurent Pinchart June 1, 2021, 12:19 a.m. UTC | #1 
On Tue, Jun 01, 2021 at 01:53:28AM +0300, Laurent Pinchart wrote:
> The Chrome OS-specific code has multiple function parameters that are
> not used. This results in compilation warnings. Fix them with
> [[maybe_unused]].
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Change-Id: I4f05ace5c1781b2593e80532553b6a02e399fed6

Apologies for this.

> ---
>  src/android/cros/camera3_hal.cpp      | 2 +-
>  src/android/mm/cros_camera_buffer.cpp | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/android/cros/camera3_hal.cpp b/src/android/cros/camera3_hal.cpp
> index d6fc1d0fca06..fb863b5f9aa9 100644
> --- a/src/android/cros/camera3_hal.cpp
> +++ b/src/android/cros/camera3_hal.cpp
> @@ -9,7 +9,7 @@
>  
>  #include "../camera_hal_manager.h"
>  
> -static void set_up(cros::CameraMojoChannelManagerToken *token)
> +static void set_up([[maybe_unused]] cros::CameraMojoChannelManagerToken *token)
>  {
>  }
>  
> diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp
> index 1a4fd5d1dfe3..59e26d1b5972 100644
> --- a/src/android/mm/cros_camera_buffer.cpp
> +++ b/src/android/mm/cros_camera_buffer.cpp
> @@ -48,7 +48,8 @@ private:
>  };
>  
>  CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,
> -			       buffer_handle_t camera3Buffer, int flags)
> +			       buffer_handle_t camera3Buffer,
> +			       [[maybe_unused]] int flags)
>  	: Extensible::Private(cameraBuffer), handle_(camera3Buffer),
>  	  numPlanes_(0), valid_(false), registered_(false)
>  {
> @@ -128,7 +129,7 @@ Span<uint8_t> CameraBuffer::Private::plane(unsigned int plane)
>  		 bufferManager_->GetPlaneSize(handle_, plane) };
>  }
>  
> -size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const
> +size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t maxJpegBufferSize) const
>  {
>  	return bufferManager_->GetPlaneSize(handle_, 0);
>  }
Paul Elder June 1, 2021, 3:11 a.m. UTC | #2 
Hi Laurent,

On Tue, Jun 01, 2021 at 01:53:28AM +0300, Laurent Pinchart wrote:
> The Chrome OS-specific code has multiple function parameters that are
> not used. This results in compilation warnings. Fix them with
> [[maybe_unused]].
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Change-Id: I4f05ace5c1781b2593e80532553b6a02e399fed6

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

> ---
>  src/android/cros/camera3_hal.cpp      | 2 +-
>  src/android/mm/cros_camera_buffer.cpp | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/android/cros/camera3_hal.cpp b/src/android/cros/camera3_hal.cpp
> index d6fc1d0fca06..fb863b5f9aa9 100644
> --- a/src/android/cros/camera3_hal.cpp
> +++ b/src/android/cros/camera3_hal.cpp
> @@ -9,7 +9,7 @@
>  
>  #include "../camera_hal_manager.h"
>  
> -static void set_up(cros::CameraMojoChannelManagerToken *token)
> +static void set_up([[maybe_unused]] cros::CameraMojoChannelManagerToken *token)
>  {
>  }
>  
> diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp
> index 1a4fd5d1dfe3..59e26d1b5972 100644
> --- a/src/android/mm/cros_camera_buffer.cpp
> +++ b/src/android/mm/cros_camera_buffer.cpp
> @@ -48,7 +48,8 @@ private:
>  };
>  
>  CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,
> -			       buffer_handle_t camera3Buffer, int flags)
> +			       buffer_handle_t camera3Buffer,
> +			       [[maybe_unused]] int flags)
>  	: Extensible::Private(cameraBuffer), handle_(camera3Buffer),
>  	  numPlanes_(0), valid_(false), registered_(false)
>  {
> @@ -128,7 +129,7 @@ Span<uint8_t> CameraBuffer::Private::plane(unsigned int plane)
>  		 bufferManager_->GetPlaneSize(handle_, plane) };
>  }
>  
> -size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const
> +size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t maxJpegBufferSize) const
>  {
>  	return bufferManager_->GetPlaneSize(handle_, 0);
>  }
Hirokazu Honda June 1, 2021, 3:54 a.m. UTC | #3 
Hi Laurent, thank you for the patch.

On Tue, Jun 1, 2021 at 12:11 PM <paul.elder@ideasonboard.com> wrote:

> Hi Laurent,
>
> On Tue, Jun 01, 2021 at 01:53:28AM +0300, Laurent Pinchart wrote:
> > The Chrome OS-specific code has multiple function parameters that are
> > not used. This results in compilation warnings. Fix them with
> > [[maybe_unused]].
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Change-Id: I4f05ace5c1781b2593e80532553b6a02e399fed6
>
> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
>

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>

>
> > ---
> >  src/android/cros/camera3_hal.cpp      | 2 +-
> >  src/android/mm/cros_camera_buffer.cpp | 5 +++--
> >  2 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/src/android/cros/camera3_hal.cpp
> b/src/android/cros/camera3_hal.cpp
> > index d6fc1d0fca06..fb863b5f9aa9 100644
> > --- a/src/android/cros/camera3_hal.cpp
> > +++ b/src/android/cros/camera3_hal.cpp
> > @@ -9,7 +9,7 @@
> >
> >  #include "../camera_hal_manager.h"
> >
> > -static void set_up(cros::CameraMojoChannelManagerToken *token)
> > +static void set_up([[maybe_unused]] cros::CameraMojoChannelManagerToken
> *token)
> >  {
> >  }
> >
> > diff --git a/src/android/mm/cros_camera_buffer.cpp
> b/src/android/mm/cros_camera_buffer.cpp
> > index 1a4fd5d1dfe3..59e26d1b5972 100644
> > --- a/src/android/mm/cros_camera_buffer.cpp
> > +++ b/src/android/mm/cros_camera_buffer.cpp
> > @@ -48,7 +48,8 @@ private:
> >  };
> >
> >  CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,
> > -                            buffer_handle_t camera3Buffer, int flags)
> > +                            buffer_handle_t camera3Buffer,
> > +                            [[maybe_unused]] int flags)
> >       : Extensible::Private(cameraBuffer), handle_(camera3Buffer),
> >         numPlanes_(0), valid_(false), registered_(false)
> >  {
> > @@ -128,7 +129,7 @@ Span<uint8_t> CameraBuffer::Private::plane(unsigned
> int plane)
> >                bufferManager_->GetPlaneSize(handle_, plane) };
> >  }
> >
> > -size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize)
> const
> > +size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t
> maxJpegBufferSize) const
> >  {
> >       return bufferManager_->GetPlaneSize(handle_, 0);
> >  }
>

Patch
diff mbox series 

diff --git a/src/android/cros/camera3_hal.cpp b/src/android/cros/camera3_hal.cpp
index d6fc1d0fca06..fb863b5f9aa9 100644
--- a/src/android/cros/camera3_hal.cpp
+++ b/src/android/cros/camera3_hal.cpp
@@ -9,7 +9,7 @@ 
 
 #include "../camera_hal_manager.h"
 
-static void set_up(cros::CameraMojoChannelManagerToken *token)
+static void set_up([[maybe_unused]] cros::CameraMojoChannelManagerToken *token)
 {
 }
 
diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp
index 1a4fd5d1dfe3..59e26d1b5972 100644
--- a/src/android/mm/cros_camera_buffer.cpp
+++ b/src/android/mm/cros_camera_buffer.cpp
@@ -48,7 +48,8 @@  private:
 };
 
 CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,
-			       buffer_handle_t camera3Buffer, int flags)
+			       buffer_handle_t camera3Buffer,
+			       [[maybe_unused]] int flags)
 	: Extensible::Private(cameraBuffer), handle_(camera3Buffer),
 	  numPlanes_(0), valid_(false), registered_(false)
 {
@@ -128,7 +129,7 @@  Span<uint8_t> CameraBuffer::Private::plane(unsigned int plane)
 		 bufferManager_->GetPlaneSize(handle_, plane) };
 }
 
-size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const
+size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t maxJpegBufferSize) const
 {
 	return bufferManager_->GetPlaneSize(handle_, 0);
 }