[libcamera-devel] libcamera: Remove void specifier for functions that take no arguments

Message ID 20200822160502.11932-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit f976eb5cb63f0c5e802dbd4faefa82eb927c2f47
Headers show
Series
  • [libcamera-devel] libcamera: Remove void specifier for functions that take no arguments
Related show

Commit Message

Laurent Pinchart Aug. 22, 2020, 4:05 p.m. UTC
In C++, unlike in C, a function that takes no argument doesn't need to
specify void in the arguments list. Drop the unnecessary specifiers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/internal/ipa_module.h | 2 +-
 src/android/camera3_hal.cpp             | 2 +-
 src/gstreamer/gstlibcameraallocator.cpp | 2 +-
 src/gstreamer/gstlibcamerapad.cpp       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Comments

Kieran Bingham Aug. 24, 2020, 9:40 a.m. UTC | #1
Hi Laurent,

On 22/08/2020 17:05, Laurent Pinchart wrote:
> In C++, unlike in C, a function that takes no argument doesn't need to
> specify void in the arguments list. Drop the unnecessary specifiers.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  include/libcamera/internal/ipa_module.h | 2 +-
>  src/android/camera3_hal.cpp             | 2 +-
>  src/gstreamer/gstlibcameraallocator.cpp | 2 +-
>  src/gstreamer/gstlibcamerapad.cpp       | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h
> index 6355671fd861..c2df2476b2ff 100644
> --- a/include/libcamera/internal/ipa_module.h
> +++ b/include/libcamera/internal/ipa_module.h
> @@ -52,7 +52,7 @@ private:
>  	bool loaded_;
>  
>  	void *dlHandle_;
> -	typedef struct ipa_context *(*IPAIntfFactory)(void);
> +	typedef struct ipa_context *(*IPAIntfFactory)();
>  	IPAIntfFactory ipaCreate_;
>  };
>  
> diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp
> index 716e36c72b83..decaf59e6915 100644
> --- a/src/android/camera3_hal.cpp
> +++ b/src/android/camera3_hal.cpp
> @@ -22,7 +22,7 @@ static CameraHalManager cameraManager;
>   * Android Camera HAL callbacks
>   */
>  
> -static int hal_get_number_of_cameras(void)
> +static int hal_get_number_of_cameras()
>  {
>  	return cameraManager.numCameras();
>  }
> diff --git a/src/gstreamer/gstlibcameraallocator.cpp b/src/gstreamer/gstlibcameraallocator.cpp
> index 1d5959c076cb..78ded4022bda 100644
> --- a/src/gstreamer/gstlibcameraallocator.cpp
> +++ b/src/gstreamer/gstlibcameraallocator.cpp
> @@ -70,7 +70,7 @@ FrameWrap::~FrameWrap()
>  	}
>  }
>  
> -GQuark FrameWrap::getQuark(void)
> +GQuark FrameWrap::getQuark()
>  {
>  	static gsize frame_quark = 0;
>  
> diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp
> index e184495aed5a..9f3e2be53b66 100644
> --- a/src/gstreamer/gstlibcamerapad.cpp
> +++ b/src/gstreamer/gstlibcamerapad.cpp
> @@ -84,7 +84,7 @@ gst_libcamera_pad_init(GstLibcameraPad *self)
>  }
>  
>  static GType
> -gst_libcamera_stream_role_get_type(void)
> +gst_libcamera_stream_role_get_type()
>  {
>  	static GType type = 0;
>  	static const GEnumValue values[] = {
>
Niklas Söderlund Aug. 24, 2020, 10:50 p.m. UTC | #2
Hi Laurent,

Thanks for your work.

On 2020-08-22 19:05:02 +0300, Laurent Pinchart wrote:
> In C++, unlike in C, a function that takes no argument doesn't need to
> specify void in the arguments list. Drop the unnecessary specifiers.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

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

> ---
>  include/libcamera/internal/ipa_module.h | 2 +-
>  src/android/camera3_hal.cpp             | 2 +-
>  src/gstreamer/gstlibcameraallocator.cpp | 2 +-
>  src/gstreamer/gstlibcamerapad.cpp       | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h
> index 6355671fd861..c2df2476b2ff 100644
> --- a/include/libcamera/internal/ipa_module.h
> +++ b/include/libcamera/internal/ipa_module.h
> @@ -52,7 +52,7 @@ private:
>  	bool loaded_;
>  
>  	void *dlHandle_;
> -	typedef struct ipa_context *(*IPAIntfFactory)(void);
> +	typedef struct ipa_context *(*IPAIntfFactory)();
>  	IPAIntfFactory ipaCreate_;
>  };
>  
> diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp
> index 716e36c72b83..decaf59e6915 100644
> --- a/src/android/camera3_hal.cpp
> +++ b/src/android/camera3_hal.cpp
> @@ -22,7 +22,7 @@ static CameraHalManager cameraManager;
>   * Android Camera HAL callbacks
>   */
>  
> -static int hal_get_number_of_cameras(void)
> +static int hal_get_number_of_cameras()
>  {
>  	return cameraManager.numCameras();
>  }
> diff --git a/src/gstreamer/gstlibcameraallocator.cpp b/src/gstreamer/gstlibcameraallocator.cpp
> index 1d5959c076cb..78ded4022bda 100644
> --- a/src/gstreamer/gstlibcameraallocator.cpp
> +++ b/src/gstreamer/gstlibcameraallocator.cpp
> @@ -70,7 +70,7 @@ FrameWrap::~FrameWrap()
>  	}
>  }
>  
> -GQuark FrameWrap::getQuark(void)
> +GQuark FrameWrap::getQuark()
>  {
>  	static gsize frame_quark = 0;
>  
> diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp
> index e184495aed5a..9f3e2be53b66 100644
> --- a/src/gstreamer/gstlibcamerapad.cpp
> +++ b/src/gstreamer/gstlibcamerapad.cpp
> @@ -84,7 +84,7 @@ gst_libcamera_pad_init(GstLibcameraPad *self)
>  }
>  
>  static GType
> -gst_libcamera_stream_role_get_type(void)
> +gst_libcamera_stream_role_get_type()
>  {
>  	static GType type = 0;
>  	static const GEnumValue values[] = {
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h
index 6355671fd861..c2df2476b2ff 100644
--- a/include/libcamera/internal/ipa_module.h
+++ b/include/libcamera/internal/ipa_module.h
@@ -52,7 +52,7 @@  private:
 	bool loaded_;
 
 	void *dlHandle_;
-	typedef struct ipa_context *(*IPAIntfFactory)(void);
+	typedef struct ipa_context *(*IPAIntfFactory)();
 	IPAIntfFactory ipaCreate_;
 };
 
diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp
index 716e36c72b83..decaf59e6915 100644
--- a/src/android/camera3_hal.cpp
+++ b/src/android/camera3_hal.cpp
@@ -22,7 +22,7 @@  static CameraHalManager cameraManager;
  * Android Camera HAL callbacks
  */
 
-static int hal_get_number_of_cameras(void)
+static int hal_get_number_of_cameras()
 {
 	return cameraManager.numCameras();
 }
diff --git a/src/gstreamer/gstlibcameraallocator.cpp b/src/gstreamer/gstlibcameraallocator.cpp
index 1d5959c076cb..78ded4022bda 100644
--- a/src/gstreamer/gstlibcameraallocator.cpp
+++ b/src/gstreamer/gstlibcameraallocator.cpp
@@ -70,7 +70,7 @@  FrameWrap::~FrameWrap()
 	}
 }
 
-GQuark FrameWrap::getQuark(void)
+GQuark FrameWrap::getQuark()
 {
 	static gsize frame_quark = 0;
 
diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp
index e184495aed5a..9f3e2be53b66 100644
--- a/src/gstreamer/gstlibcamerapad.cpp
+++ b/src/gstreamer/gstlibcamerapad.cpp
@@ -84,7 +84,7 @@  gst_libcamera_pad_init(GstLibcameraPad *self)
 }
 
 static GType
-gst_libcamera_stream_role_get_type(void)
+gst_libcamera_stream_role_get_type()
 {
 	static GType type = 0;
 	static const GEnumValue values[] = {