[libcamera-devel,5/8] include: libcamera: Omit extra semicolons
diff mbox series

Message ID 20201020052905.89267-6-hiroh@chromium.org
State Accepted
Headers show
Series
  • [libcamera-devel,1/8] test: Omit extra semicolons
Related show

Commit Message

Hirokazu Honda Oct. 20, 2020, 5:29 a.m. UTC
REGISTER_PIPELINE_HANDLER macro is used with the end semicolon
everywhere. This removes the end semicolon within the macro.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
---
 include/libcamera/internal/pipeline_handler.h | 2 +-
 include/libcamera/span.h                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Laurent Pinchart Oct. 20, 2020, 7:44 a.m. UTC | #1
Hi Hiro-san,

Thank you for the patch.

On Tue, Oct 20, 2020 at 02:29:02PM +0900, Hirokazu Honda wrote:
> REGISTER_PIPELINE_HANDLER macro is used with the end semicolon
> everywhere. This removes the end semicolon within the macro.
> 
> Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
> ---
>  include/libcamera/internal/pipeline_handler.h | 2 +-
>  include/libcamera/span.h                      | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
> index a4e1b52..818a36a 100644
> --- a/include/libcamera/internal/pipeline_handler.h
> +++ b/include/libcamera/internal/pipeline_handler.h
> @@ -145,7 +145,7 @@ private:								\
>  		return new handler(manager);				\
>  	}								\
>  };									\
> -static handler##Factory global_##handler##Factory;
> +static handler##Factory global_##handler##Factory

In most cases we include the semicolon inside the macro
(LOG_DECLARE_CATEGORY for instance). For consistency, wouldn't it be
better to keep it here, and remove it from pipeline handlers where the
macro is used ?

>  
>  } /* namespace libcamera */
>  
> diff --git a/include/libcamera/span.h b/include/libcamera/span.h
> index a53a80b..c0e4399 100644
> --- a/include/libcamera/span.h
> +++ b/include/libcamera/span.h
> @@ -407,6 +407,6 @@ private:
>  	size_type size_;
>  };
>  
> -}; /* namespace libcamera */
> +} /* namespace libcamera */
>  
>  #endif /* __LIBCAMERA_SPAN_H__ */
Hirokazu Honda Oct. 20, 2020, 8:21 a.m. UTC | #2
Hi Laurent,

On Tue, Oct 20, 2020 at 4:44 PM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> Hi Hiro-san,
>
> Thank you for the patch.
>
> On Tue, Oct 20, 2020 at 02:29:02PM +0900, Hirokazu Honda wrote:
> > REGISTER_PIPELINE_HANDLER macro is used with the end semicolon
> > everywhere. This removes the end semicolon within the macro.
> >
> > Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
> > ---
> >  include/libcamera/internal/pipeline_handler.h | 2 +-
> >  include/libcamera/span.h                      | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
> > index a4e1b52..818a36a 100644
> > --- a/include/libcamera/internal/pipeline_handler.h
> > +++ b/include/libcamera/internal/pipeline_handler.h
> > @@ -145,7 +145,7 @@ private:                                                          \
> >               return new handler(manager);                            \
> >       }                                                               \
> >  };                                                                   \
> > -static handler##Factory global_##handler##Factory;
> > +static handler##Factory global_##handler##Factory
>
> In most cases we include the semicolon inside the macro
> (LOG_DECLARE_CATEGORY for instance). For consistency, wouldn't it be
> better to keep it here, and remove it from pipeline handlers where the
> macro is used ?
>

Sounds good to me. Thanks.

> >
> >  } /* namespace libcamera */
> >
> > diff --git a/include/libcamera/span.h b/include/libcamera/span.h
> > index a53a80b..c0e4399 100644
> > --- a/include/libcamera/span.h
> > +++ b/include/libcamera/span.h
> > @@ -407,6 +407,6 @@ private:
> >       size_type size_;
> >  };
> >
> > -}; /* namespace libcamera */
> > +} /* namespace libcamera */
> >
> >  #endif /* __LIBCAMERA_SPAN_H__ */
>
> --
> Regards,
>
> Laurent Pinchart

Patch
diff mbox series

diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
index a4e1b52..818a36a 100644
--- a/include/libcamera/internal/pipeline_handler.h
+++ b/include/libcamera/internal/pipeline_handler.h
@@ -145,7 +145,7 @@  private:								\
 		return new handler(manager);				\
 	}								\
 };									\
-static handler##Factory global_##handler##Factory;
+static handler##Factory global_##handler##Factory
 
 } /* namespace libcamera */
 
diff --git a/include/libcamera/span.h b/include/libcamera/span.h
index a53a80b..c0e4399 100644
--- a/include/libcamera/span.h
+++ b/include/libcamera/span.h
@@ -407,6 +407,6 @@  private:
 	size_type size_;
 };
 
-}; /* namespace libcamera */
+} /* namespace libcamera */
 
 #endif /* __LIBCAMERA_SPAN_H__ */