[libcamera-devel,4/5] libcamera: Drop semicolon after LOG_{DECLARE, DEFINE}_CATEGORY
diff mbox series

Message ID 20201020000310.3008-5-laurent.pinchart@ideasonboard.com
State Superseded
Delegated to: Laurent Pinchart
Headers show
Series
  • libcamera: Miscellaneous documentation fixes
Related show

Commit Message

Laurent Pinchart Oct. 20, 2020, 12:03 a.m. UTC 
No semicolon is needed after the macro. Drop it in the few locations
that have one.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/byte_stream_buffer.cpp                  | 2 +-
 src/libcamera/camera_sensor.cpp                       | 2 +-
 src/libcamera/file.cpp                                | 2 +-
 src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp | 2 +-
 src/libcamera/pipeline/simple/converter.cpp           | 2 +-
 src/libcamera/sysfs.cpp                               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Comments

Paul Elder Oct. 20, 2020, 2:57 a.m. UTC | #1 
Hi Laurent,

On Tue, Oct 20, 2020 at 03:03:09AM +0300, Laurent Pinchart wrote:
> No semicolon is needed after the macro. Drop it in the few locations
> that have one.

I see android and v4l2 have the same issue in some places. I guess
that can be done on top.

> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

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

> ---
>  src/libcamera/byte_stream_buffer.cpp                  | 2 +-
>  src/libcamera/camera_sensor.cpp                       | 2 +-
>  src/libcamera/file.cpp                                | 2 +-
>  src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp | 2 +-
>  src/libcamera/pipeline/simple/converter.cpp           | 2 +-
>  src/libcamera/sysfs.cpp                               | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp
> index eb9003927266..7fc6f6944471 100644
> --- a/src/libcamera/byte_stream_buffer.cpp
> +++ b/src/libcamera/byte_stream_buffer.cpp
> @@ -19,7 +19,7 @@
>  
>  namespace libcamera {
>  
> -LOG_DEFINE_CATEGORY(Serialization);
> +LOG_DEFINE_CATEGORY(Serialization)
>  
>  /**
>   * \class ByteStreamBuffer
> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
> index 78c7ceec7c44..935de528c496 100644
> --- a/src/libcamera/camera_sensor.cpp
> +++ b/src/libcamera/camera_sensor.cpp
> @@ -28,7 +28,7 @@
>  
>  namespace libcamera {
>  
> -LOG_DEFINE_CATEGORY(CameraSensor);
> +LOG_DEFINE_CATEGORY(CameraSensor)
>  
>  /**
>   * \struct CameraSensorInfo
> diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp
> index 04b0cb61a1bf..3a3f5bb63ffc 100644
> --- a/src/libcamera/file.cpp
> +++ b/src/libcamera/file.cpp
> @@ -23,7 +23,7 @@
>  
>  namespace libcamera {
>  
> -LOG_DEFINE_CATEGORY(File);
> +LOG_DEFINE_CATEGORY(File)
>  
>  /**
>   * \class File
> diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> index 0572acc93d63..62605c0fceee 100644
> --- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> +++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> @@ -17,7 +17,7 @@
>  
>  namespace libcamera {
>  
> -LOG_DEFINE_CATEGORY(RPI_S_W);
> +LOG_DEFINE_CATEGORY(RPI_S_W)
>  
>  namespace RPi {
>  
> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp
> index 75fb297ebd58..b4ee021f6210 100644
> --- a/src/libcamera/pipeline/simple/converter.cpp
> +++ b/src/libcamera/pipeline/simple/converter.cpp
> @@ -21,7 +21,7 @@
>  
>  namespace libcamera {
>  
> -LOG_DECLARE_CATEGORY(SimplePipeline);
> +LOG_DECLARE_CATEGORY(SimplePipeline)
>  
>  SimpleConverter::SimpleConverter(MediaDevice *media)
>  	: m2m_(nullptr)
> diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp
> index 6c8e9554188d..3ebe66f8d69b 100644
> --- a/src/libcamera/sysfs.cpp
> +++ b/src/libcamera/sysfs.cpp
> @@ -22,7 +22,7 @@
>  
>  namespace libcamera {
>  
> -LOG_DEFINE_CATEGORY(SysFs);
> +LOG_DEFINE_CATEGORY(SysFs)
>  
>  namespace sysfs {
>  
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Umang Jain Oct. 20, 2020, 3:27 a.m. UTC | #2 
Hi Laurent,

On 10/20/20 5:33 AM, Laurent Pinchart wrote:
> No semicolon is needed after the macro. Drop it in the few locations
> that have one.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
LGTM.
Reviewed-by: Umang Jain <email@uajain.com>
> ---
>   src/libcamera/byte_stream_buffer.cpp                  | 2 +-
>   src/libcamera/camera_sensor.cpp                       | 2 +-
>   src/libcamera/file.cpp                                | 2 +-
>   src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp | 2 +-
>   src/libcamera/pipeline/simple/converter.cpp           | 2 +-
>   src/libcamera/sysfs.cpp                               | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp
> index eb9003927266..7fc6f6944471 100644
> --- a/src/libcamera/byte_stream_buffer.cpp
> +++ b/src/libcamera/byte_stream_buffer.cpp
> @@ -19,7 +19,7 @@
>   
>   namespace libcamera {
>   
> -LOG_DEFINE_CATEGORY(Serialization);
> +LOG_DEFINE_CATEGORY(Serialization)
>   
>   /**
>    * \class ByteStreamBuffer
> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
> index 78c7ceec7c44..935de528c496 100644
> --- a/src/libcamera/camera_sensor.cpp
> +++ b/src/libcamera/camera_sensor.cpp
> @@ -28,7 +28,7 @@
>   
>   namespace libcamera {
>   
> -LOG_DEFINE_CATEGORY(CameraSensor);
> +LOG_DEFINE_CATEGORY(CameraSensor)
>   
>   /**
>    * \struct CameraSensorInfo
> diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp
> index 04b0cb61a1bf..3a3f5bb63ffc 100644
> --- a/src/libcamera/file.cpp
> +++ b/src/libcamera/file.cpp
> @@ -23,7 +23,7 @@
>   
>   namespace libcamera {
>   
> -LOG_DEFINE_CATEGORY(File);
> +LOG_DEFINE_CATEGORY(File)
>   
>   /**
>    * \class File
> diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> index 0572acc93d63..62605c0fceee 100644
> --- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> +++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> @@ -17,7 +17,7 @@
>   
>   namespace libcamera {
>   
> -LOG_DEFINE_CATEGORY(RPI_S_W);
> +LOG_DEFINE_CATEGORY(RPI_S_W)
>   
>   namespace RPi {
>   
> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp
> index 75fb297ebd58..b4ee021f6210 100644
> --- a/src/libcamera/pipeline/simple/converter.cpp
> +++ b/src/libcamera/pipeline/simple/converter.cpp
> @@ -21,7 +21,7 @@
>   
>   namespace libcamera {
>   
> -LOG_DECLARE_CATEGORY(SimplePipeline);
> +LOG_DECLARE_CATEGORY(SimplePipeline)
>   
>   SimpleConverter::SimpleConverter(MediaDevice *media)
>   	: m2m_(nullptr)
> diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp
> index 6c8e9554188d..3ebe66f8d69b 100644
> --- a/src/libcamera/sysfs.cpp
> +++ b/src/libcamera/sysfs.cpp
> @@ -22,7 +22,7 @@
>   
>   namespace libcamera {
>   
> -LOG_DEFINE_CATEGORY(SysFs);
> +LOG_DEFINE_CATEGORY(SysFs)
>   
>   namespace sysfs {
>
Laurent Pinchart Oct. 20, 2020, 3:28 a.m. UTC | #3 
Hi Paul,

On Tue, Oct 20, 2020 at 11:57:19AM +0900, paul.elder@ideasonboard.com wrote:
> On Tue, Oct 20, 2020 at 03:03:09AM +0300, Laurent Pinchart wrote:
> > No semicolon is needed after the macro. Drop it in the few locations
> > that have one.
> 
> I see android and v4l2 have the same issue in some places. I guess
> that can be done on top.

Oops, I've missed that. I'll post a new version.

> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
> 
> > ---
> >  src/libcamera/byte_stream_buffer.cpp                  | 2 +-
> >  src/libcamera/camera_sensor.cpp                       | 2 +-
> >  src/libcamera/file.cpp                                | 2 +-
> >  src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp | 2 +-
> >  src/libcamera/pipeline/simple/converter.cpp           | 2 +-
> >  src/libcamera/sysfs.cpp                               | 2 +-
> >  6 files changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp
> > index eb9003927266..7fc6f6944471 100644
> > --- a/src/libcamera/byte_stream_buffer.cpp
> > +++ b/src/libcamera/byte_stream_buffer.cpp
> > @@ -19,7 +19,7 @@
> >  
> >  namespace libcamera {
> >  
> > -LOG_DEFINE_CATEGORY(Serialization);
> > +LOG_DEFINE_CATEGORY(Serialization)
> >  
> >  /**
> >   * \class ByteStreamBuffer
> > diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
> > index 78c7ceec7c44..935de528c496 100644
> > --- a/src/libcamera/camera_sensor.cpp
> > +++ b/src/libcamera/camera_sensor.cpp
> > @@ -28,7 +28,7 @@
> >  
> >  namespace libcamera {
> >  
> > -LOG_DEFINE_CATEGORY(CameraSensor);
> > +LOG_DEFINE_CATEGORY(CameraSensor)
> >  
> >  /**
> >   * \struct CameraSensorInfo
> > diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp
> > index 04b0cb61a1bf..3a3f5bb63ffc 100644
> > --- a/src/libcamera/file.cpp
> > +++ b/src/libcamera/file.cpp
> > @@ -23,7 +23,7 @@
> >  
> >  namespace libcamera {
> >  
> > -LOG_DEFINE_CATEGORY(File);
> > +LOG_DEFINE_CATEGORY(File)
> >  
> >  /**
> >   * \class File
> > diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> > index 0572acc93d63..62605c0fceee 100644
> > --- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> > +++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
> > @@ -17,7 +17,7 @@
> >  
> >  namespace libcamera {
> >  
> > -LOG_DEFINE_CATEGORY(RPI_S_W);
> > +LOG_DEFINE_CATEGORY(RPI_S_W)
> >  
> >  namespace RPi {
> >  
> > diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp
> > index 75fb297ebd58..b4ee021f6210 100644
> > --- a/src/libcamera/pipeline/simple/converter.cpp
> > +++ b/src/libcamera/pipeline/simple/converter.cpp
> > @@ -21,7 +21,7 @@
> >  
> >  namespace libcamera {
> >  
> > -LOG_DECLARE_CATEGORY(SimplePipeline);
> > +LOG_DECLARE_CATEGORY(SimplePipeline)
> >  
> >  SimpleConverter::SimpleConverter(MediaDevice *media)
> >  	: m2m_(nullptr)
> > diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp
> > index 6c8e9554188d..3ebe66f8d69b 100644
> > --- a/src/libcamera/sysfs.cpp
> > +++ b/src/libcamera/sysfs.cpp
> > @@ -22,7 +22,7 @@
> >  
> >  namespace libcamera {
> >  
> > -LOG_DEFINE_CATEGORY(SysFs);
> > +LOG_DEFINE_CATEGORY(SysFs)
> >  
> >  namespace sysfs {
Kieran Bingham Oct. 20, 2020, 10:38 a.m. UTC | #4 
Hi Laurent,

On 20/10/2020 04:28, Laurent Pinchart wrote:
> Hi Paul,
> 
> On Tue, Oct 20, 2020 at 11:57:19AM +0900, paul.elder@ideasonboard.com wrote:
>> On Tue, Oct 20, 2020 at 03:03:09AM +0300, Laurent Pinchart wrote:
>>> No semicolon is needed after the macro. Drop it in the few locations
>>> that have one.
>>
>> I see android and v4l2 have the same issue in some places. I guess
>> that can be done on top.
> 
> Oops, I've missed that. I'll post a new version.

Were these not caught by Hiro's series?

Either way, as long as they're done ;-)

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

>>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>
>> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
>>
>>> ---
>>>  src/libcamera/byte_stream_buffer.cpp                  | 2 +-
>>>  src/libcamera/camera_sensor.cpp                       | 2 +-
>>>  src/libcamera/file.cpp                                | 2 +-
>>>  src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp | 2 +-
>>>  src/libcamera/pipeline/simple/converter.cpp           | 2 +-
>>>  src/libcamera/sysfs.cpp                               | 2 +-
>>>  6 files changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp
>>> index eb9003927266..7fc6f6944471 100644
>>> --- a/src/libcamera/byte_stream_buffer.cpp
>>> +++ b/src/libcamera/byte_stream_buffer.cpp
>>> @@ -19,7 +19,7 @@
>>>  
>>>  namespace libcamera {
>>>  
>>> -LOG_DEFINE_CATEGORY(Serialization);
>>> +LOG_DEFINE_CATEGORY(Serialization)
>>>  
>>>  /**
>>>   * \class ByteStreamBuffer
>>> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
>>> index 78c7ceec7c44..935de528c496 100644
>>> --- a/src/libcamera/camera_sensor.cpp
>>> +++ b/src/libcamera/camera_sensor.cpp
>>> @@ -28,7 +28,7 @@
>>>  
>>>  namespace libcamera {
>>>  
>>> -LOG_DEFINE_CATEGORY(CameraSensor);
>>> +LOG_DEFINE_CATEGORY(CameraSensor)
>>>  
>>>  /**
>>>   * \struct CameraSensorInfo
>>> diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp
>>> index 04b0cb61a1bf..3a3f5bb63ffc 100644
>>> --- a/src/libcamera/file.cpp
>>> +++ b/src/libcamera/file.cpp
>>> @@ -23,7 +23,7 @@
>>>  
>>>  namespace libcamera {
>>>  
>>> -LOG_DEFINE_CATEGORY(File);
>>> +LOG_DEFINE_CATEGORY(File)
>>>  
>>>  /**
>>>   * \class File
>>> diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
>>> index 0572acc93d63..62605c0fceee 100644
>>> --- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
>>> +++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
>>> @@ -17,7 +17,7 @@
>>>  
>>>  namespace libcamera {
>>>  
>>> -LOG_DEFINE_CATEGORY(RPI_S_W);
>>> +LOG_DEFINE_CATEGORY(RPI_S_W)
>>>  
>>>  namespace RPi {
>>>  
>>> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp
>>> index 75fb297ebd58..b4ee021f6210 100644
>>> --- a/src/libcamera/pipeline/simple/converter.cpp
>>> +++ b/src/libcamera/pipeline/simple/converter.cpp
>>> @@ -21,7 +21,7 @@
>>>  
>>>  namespace libcamera {
>>>  
>>> -LOG_DECLARE_CATEGORY(SimplePipeline);
>>> +LOG_DECLARE_CATEGORY(SimplePipeline)
>>>  
>>>  SimpleConverter::SimpleConverter(MediaDevice *media)
>>>  	: m2m_(nullptr)
>>> diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp
>>> index 6c8e9554188d..3ebe66f8d69b 100644
>>> --- a/src/libcamera/sysfs.cpp
>>> +++ b/src/libcamera/sysfs.cpp
>>> @@ -22,7 +22,7 @@
>>>  
>>>  namespace libcamera {
>>>  
>>> -LOG_DEFINE_CATEGORY(SysFs);
>>> +LOG_DEFINE_CATEGORY(SysFs)
>>>  
>>>  namespace sysfs {
>

Patch
diff mbox series 

diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp
index eb9003927266..7fc6f6944471 100644
--- a/src/libcamera/byte_stream_buffer.cpp
+++ b/src/libcamera/byte_stream_buffer.cpp
@@ -19,7 +19,7 @@ 
 
 namespace libcamera {
 
-LOG_DEFINE_CATEGORY(Serialization);
+LOG_DEFINE_CATEGORY(Serialization)
 
 /**
  * \class ByteStreamBuffer
diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
index 78c7ceec7c44..935de528c496 100644
--- a/src/libcamera/camera_sensor.cpp
+++ b/src/libcamera/camera_sensor.cpp
@@ -28,7 +28,7 @@ 
 
 namespace libcamera {
 
-LOG_DEFINE_CATEGORY(CameraSensor);
+LOG_DEFINE_CATEGORY(CameraSensor)
 
 /**
  * \struct CameraSensorInfo
diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp
index 04b0cb61a1bf..3a3f5bb63ffc 100644
--- a/src/libcamera/file.cpp
+++ b/src/libcamera/file.cpp
@@ -23,7 +23,7 @@ 
 
 namespace libcamera {
 
-LOG_DEFINE_CATEGORY(File);
+LOG_DEFINE_CATEGORY(File)
 
 /**
  * \class File
diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
index 0572acc93d63..62605c0fceee 100644
--- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
+++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp
@@ -17,7 +17,7 @@ 
 
 namespace libcamera {
 
-LOG_DEFINE_CATEGORY(RPI_S_W);
+LOG_DEFINE_CATEGORY(RPI_S_W)
 
 namespace RPi {
 
diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp
index 75fb297ebd58..b4ee021f6210 100644
--- a/src/libcamera/pipeline/simple/converter.cpp
+++ b/src/libcamera/pipeline/simple/converter.cpp
@@ -21,7 +21,7 @@ 
 
 namespace libcamera {
 
-LOG_DECLARE_CATEGORY(SimplePipeline);
+LOG_DECLARE_CATEGORY(SimplePipeline)
 
 SimpleConverter::SimpleConverter(MediaDevice *media)
 	: m2m_(nullptr)
diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp
index 6c8e9554188d..3ebe66f8d69b 100644
--- a/src/libcamera/sysfs.cpp
+++ b/src/libcamera/sysfs.cpp
@@ -22,7 +22,7 @@ 
 
 namespace libcamera {
 
-LOG_DEFINE_CATEGORY(SysFs);
+LOG_DEFINE_CATEGORY(SysFs)
 
 namespace sysfs {