From 81c56a8395b438cd2cc3ef01a2fded973b7275d5 Mon Sep 17 00:00:00 2001
From: Ondrej Kozina <okozina@redhat.com>
Date: Wed, 16 Nov 2022 16:50:29 +0100
Subject: [PATCH] Move assert include in internal header files.

---
 lib/crypto_backend/base64.c         | 1 -
 lib/crypto_backend/crypto_backend.h | 1 +
 lib/crypto_backend/crypto_gcrypt.c  | 1 -
 lib/crypto_backend/utf8.c           | 1 -
 lib/fvault2/fvault2.c               | 1 -
 lib/internal.h                      | 1 +
 lib/keyslot_context.c               | 1 -
 lib/libdevmapper.c                  | 1 -
 lib/luks1/keymanage.c               | 1 -
 lib/luks2/luks2_disk_metadata.c     | 2 --
 lib/luks2/luks2_json_format.c       | 1 -
 lib/luks2/luks2_json_metadata.c     | 1 -
 lib/luks2/luks2_reencrypt.c         | 2 --
 lib/luks2/luks2_reencrypt_digest.c  | 1 -
 lib/luks2/luks2_token.c             | 1 -
 lib/luks2/luks2_token_keyring.c     | 2 --
 lib/random.c                        | 1 -
 lib/setup.c                         | 1 -
 lib/tcrypt/tcrypt.c                 | 1 -
 lib/utils_device.c                  | 1 -
 lib/utils_device_locking.c          | 1 -
 21 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/lib/crypto_backend/base64.c b/lib/crypto_backend/base64.c
index af5e9271..d3bce436 100644
--- a/lib/crypto_backend/base64.c
+++ b/lib/crypto_backend/base64.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <assert.h>
 
 #include "crypto_backend.h"
 
diff --git a/lib/crypto_backend/crypto_backend.h b/lib/crypto_backend/crypto_backend.h
index 2b79bbff..efb47110 100644
--- a/lib/crypto_backend/crypto_backend.h
+++ b/lib/crypto_backend/crypto_backend.h
@@ -21,6 +21,7 @@
 #ifndef _CRYPTO_BACKEND_H
 #define _CRYPTO_BACKEND_H
 
+#include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/lib/crypto_backend/crypto_gcrypt.c b/lib/crypto_backend/crypto_gcrypt.c
index b17a0912..67b4ca5d 100644
--- a/lib/crypto_backend/crypto_gcrypt.c
+++ b/lib/crypto_backend/crypto_gcrypt.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <assert.h>
 #include <gcrypt.h>
 #include "crypto_backend_internal.h"
 
diff --git a/lib/crypto_backend/utf8.c b/lib/crypto_backend/utf8.c
index cba50334..5f6ea03d 100644
--- a/lib/crypto_backend/utf8.c
+++ b/lib/crypto_backend/utf8.c
@@ -28,7 +28,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <assert.h>
 #include <errno.h>
 #include <endian.h>
 
diff --git a/lib/fvault2/fvault2.c b/lib/fvault2/fvault2.c
index 95ef52c6..6d6b7de4 100644
--- a/lib/fvault2/fvault2.c
+++ b/lib/fvault2/fvault2.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
 #include <errno.h>
 #include <regex.h>
 #include <stdio.h>
diff --git a/lib/internal.h b/lib/internal.h
index b1061658..edc3d837 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 #include <fcntl.h>
+#include <assert.h>
 
 #include "nls.h"
 #include "bitops.h"
diff --git a/lib/keyslot_context.c b/lib/keyslot_context.c
index b666b994..8f6224df 100644
--- a/lib/keyslot_context.c
+++ b/lib/keyslot_context.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
 #include <errno.h>
 
 #include "luks1/luks.h"
diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index 6a239e14..766c71ae 100644
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -31,7 +31,6 @@
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
-#include <assert.h>
 #include "internal.h"
 
 #define DM_CRYPT_TARGET		"crypt"
diff --git a/lib/luks1/keymanage.c b/lib/luks1/keymanage.c
index db1d61a3..1da00895 100644
--- a/lib/luks1/keymanage.c
+++ b/lib/luks1/keymanage.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <assert.h>
 #include <uuid/uuid.h>
 
 #include "luks.h"
diff --git a/lib/luks2/luks2_disk_metadata.c b/lib/luks2/luks2_disk_metadata.c
index 147e9612..bffa99c3 100644
--- a/lib/luks2/luks2_disk_metadata.c
+++ b/lib/luks2/luks2_disk_metadata.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
-
 #include "luks2_internal.h"
 
 /*
diff --git a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c
index a13a1871..ec3fe8ca 100644
--- a/lib/luks2/luks2_json_format.c
+++ b/lib/luks2/luks2_json_format.c
@@ -21,7 +21,6 @@
 
 #include "luks2_internal.h"
 #include <uuid/uuid.h>
-#include <assert.h>
 
 struct area {
 	uint64_t offset;
diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c
index c6accd05..196f2d5b 100644
--- a/lib/luks2/luks2_json_metadata.c
+++ b/lib/luks2/luks2_json_metadata.c
@@ -22,7 +22,6 @@
 
 #include "luks2_internal.h"
 #include "../integrity/integrity.h"
-#include <assert.h>
 #include <ctype.h>
 #include <uuid/uuid.h>
 
diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c
index 9b71326c..ae0b0596 100644
--- a/lib/luks2/luks2_reencrypt.c
+++ b/lib/luks2/luks2_reencrypt.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
-
 #include "luks2_internal.h"
 #include "utils_device_locking.h"
 
diff --git a/lib/luks2/luks2_reencrypt_digest.c b/lib/luks2/luks2_reencrypt_digest.c
index f5722514..63fb99dd 100644
--- a/lib/luks2/luks2_reencrypt_digest.c
+++ b/lib/luks2/luks2_reencrypt_digest.c
@@ -21,7 +21,6 @@
  */
 
 #include "luks2_internal.h"
-#include <assert.h>
 
 #define MAX_STR 64
 
diff --git a/lib/luks2/luks2_token.c b/lib/luks2/luks2_token.c
index 96cb65f8..497899ce 100644
--- a/lib/luks2/luks2_token.c
+++ b/lib/luks2/luks2_token.c
@@ -21,7 +21,6 @@
 
 #include <ctype.h>
 #include <dlfcn.h>
-#include <assert.h>
 
 #include "luks2_internal.h"
 
diff --git a/lib/luks2/luks2_token_keyring.c b/lib/luks2/luks2_token_keyring.c
index 31c797c9..a9578011 100644
--- a/lib/luks2/luks2_token_keyring.c
+++ b/lib/luks2/luks2_token_keyring.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
-
 #include "luks2_internal.h"
 
 int keyring_open(struct crypt_device *cd,
diff --git a/lib/random.c b/lib/random.c
index 78c0c343..603f6279 100644
--- a/lib/random.c
+++ b/lib/random.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 #include <sys/select.h>
 
 #include "libcryptsetup.h"
diff --git a/lib/setup.c b/lib/setup.c
index 7247ddbc..6bab5e15 100644
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/tcrypt/tcrypt.c b/lib/tcrypt/tcrypt.c
index 7d99aeb6..a75bbd85 100644
--- a/lib/tcrypt/tcrypt.c
+++ b/lib/tcrypt/tcrypt.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "libcryptsetup.h"
 #include "tcrypt.h"
diff --git a/lib/utils_device.c b/lib/utils_device.c
index 011630f7..80cb7380 100644
--- a/lib/utils_device.c
+++ b/lib/utils_device.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/utils_device_locking.c b/lib/utils_device_locking.c
index a0b6fa5e..69fedef8 100644
--- a/lib/utils_device_locking.c
+++ b/lib/utils_device_locking.c
@@ -32,7 +32,6 @@
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
 #include <libgen.h>
-#include <assert.h>
 
 #include "internal.h"
 #include "utils_device_locking.h"