threads / patch / 52209

patchkset.h, tar.h: add missing header guard to prevent multiple inclusion

Subject: [PATCH] kset.h, tar.h: add missing header guard to prevent multiple inclusion

## tl;dr

2 messages between Nov 7, 2019 and Nov 7, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Elia Pinto· Nov 7, 2019, 10:12 UTC · lore

Add missing headers to prevent ill-effects from multiple inclusion.

Found by the LGTM source code analyzer.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
 kwset.h | 4 ++++
 tar.h   | 5 +++++
 2 files changed, 9 insertions(+)

Show changes to 2 files +9 −0

kwset.h, tar.h

diff --git a/kwset.h b/kwset.h
index df99a92178..f50ecae573 100644
--- a/kwset.h
+++ b/kwset.h
@@ -1,3 +1,6 @@
+#ifndef KWSET_H
+#define KWSET_H
+
 /* This file has been copied from commit e7ac713d^ in the GNU grep git
  * repository. A few small changes have been made to adapt the code to
  * Git.
@@ -59,3 +62,4 @@ size_t kwsexec(kwset_t, char const *, size_t, struct kwsmatch *);
 /* Deallocate the given keyword set and all its associated storage. */
 void kwsfree(kwset_t);
 
+#endif /* KWSET_H */
diff --git a/tar.h b/tar.h
index 3467705e9b..6b258c4d4a 100644
--- a/tar.h
+++ b/tar.h
@@ -1,3 +1,6 @@
+#ifndef TAR_H
+#define TAR_H
+
 #define TYPEFLAG_AUTO		'\0'
 #define TYPEFLAG_REG		'0'
 #define TYPEFLAG_LNK		'2'
@@ -23,3 +26,5 @@ struct ustar_header {
 	char devminor[8];	/* 337 */
 	char prefix[155];	/* 345 */
 };
+
+#endif /* TAR_H */

-- 
2.24.0.rc0.467.g566ccdd3e4.dirty

Junio C Hamano· Nov 7, 2019, 11:11 UTC · re: Elia Pinto · lore

Re: [PATCH] kset.h, tar.h: add missing header guard to prevent multiple inclusion

Elia Pinto <gitter.spiros@gmail.com> writes:

Show 9 quoted lines

> Add missing headers to prevent ill-effects from multiple inclusion.
>
> Found by the LGTM source code analyzer.
>
> Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
> ---
>  kwset.h | 4 ++++
>  tar.h   | 5 +++++
>  2 files changed, 9 insertions(+)

Makes sense; thanks.

Show 33 quoted lines

> diff --git a/kwset.h b/kwset.h
> index df99a92178..f50ecae573 100644
> --- a/kwset.h
> +++ b/kwset.h
> @@ -1,3 +1,6 @@
> +#ifndef KWSET_H
> +#define KWSET_H
> +
>  /* This file has been copied from commit e7ac713d^ in the GNU grep git
>   * repository. A few small changes have been made to adapt the code to
>   * Git.
> @@ -59,3 +62,4 @@ size_t kwsexec(kwset_t, char const *, size_t, struct kwsmatch *);
>  /* Deallocate the given keyword set and all its associated storage. */
>  void kwsfree(kwset_t);
>  
> +#endif /* KWSET_H */
> diff --git a/tar.h b/tar.h
> index 3467705e9b..6b258c4d4a 100644
> --- a/tar.h
> +++ b/tar.h
> @@ -1,3 +1,6 @@
> +#ifndef TAR_H
> +#define TAR_H
> +
>  #define TYPEFLAG_AUTO		'\0'
>  #define TYPEFLAG_REG		'0'
>  #define TYPEFLAG_LNK		'2'
> @@ -23,3 +26,5 @@ struct ustar_header {
>  	char devminor[8];	/* 337 */
>  	char prefix[155];	/* 345 */
>  };
> +
> +#endif /* TAR_H */