build: use /* clang-format {on|off} */ annotation

Signed-off-by: Daiki Ueno <ueno@gnu.org>

18 files changed, 8 insertions, 78 deletions

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 4b4a718416..b3c6ed969b 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -30,11 +30,9 @@
 # include <gnutls/openpgp.h>
 # include <gnutls/tpm.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 /* Public key operations */
 
@@ -748,10 +746,8 @@ gnutls_pubkey_print(gnutls_pubkey_t pubkey,
 		    gnutls_certificate_print_formats_t format,
 		    gnutls_datum_t * out);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_ABSTRACT_H */
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 1fe33c839a..3454b9f31e 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -25,11 +25,9 @@
 #ifndef GNUTLS_COMPAT_H
 # define GNUTLS_COMPAT_H
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 # ifdef __GNUC__
 
@@ -228,10 +226,8 @@ int gnutls_priority_compression_list(gnutls_priority_t pcache,
 				     const unsigned int **list)
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index a4a30b13c6..b830baf643 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -25,11 +25,9 @@
 
 # include <gnutls/gnutls.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 typedef struct api_cipher_hd_st *gnutls_cipher_hd_t;
 
@@ -335,10 +333,8 @@ int gnutls_encode_gost_rs_value(gnutls_datum_t * sig_value,
 int gnutls_decode_gost_rs_value(const gnutls_datum_t * sig_value,
 				gnutls_datum_t * r, gnutls_datum_t * s);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_CRYPTO_H */
diff --git a/lib/includes/gnutls/dtls.h b/lib/includes/gnutls/dtls.h
index 225637e502..2526e98142 100644
--- a/lib/includes/gnutls/dtls.h
+++ b/lib/includes/gnutls/dtls.h
@@ -29,11 +29,9 @@
 
 # include <gnutls/gnutls.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 # define GNUTLS_COOKIE_KEY_SIZE 16
 
@@ -84,10 +82,8 @@ void gnutls_dtls_prestate_set(gnutls_session_t session,
 
 unsigned int gnutls_record_get_discarded(gnutls_session_t session);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_DTLS_H */
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 6fe6cbc7fc..b13081ce08 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -45,19 +45,19 @@
 /* Get time_t. */
 # include <time.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 # define GNUTLS_VERSION "@VERSION@"
 
-# define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@
-# define GNUTLS_VERSION_MINOR @MINOR_VERSION@
-# define GNUTLS_VERSION_PATCH @PATCH_VERSION@
+/* clang-format off */
+#define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@
+#define GNUTLS_VERSION_MINOR @MINOR_VERSION@
+#define GNUTLS_VERSION_PATCH @PATCH_VERSION@
 
-# define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@
+#define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@
+/* clang-format on */
 
 # define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 # define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
@@ -2365,9 +2365,9 @@ int gnutls_dh_params_cpy(gnutls_dh_params_t dst, gnutls_dh_params_t src);
 
 /* Session stuff
  */
-/* *INDENT-OFF* */
+/* clang-format off */
 @DEFINE_IOVEC_T@
-/* *INDENT-ON* */
+/* clang-format on */
 
 typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *, size_t);
 typedef ssize_t(*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
@@ -3634,11 +3634,9 @@ gnutls_transport_is_ktls_enabled(gnutls_session_t session);
 # define GNUTLS_E_APPLICATION_ERROR_MAX -65000
 # define GNUTLS_E_APPLICATION_ERROR_MIN -65500
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 # include <gnutls/compat.h>
 
diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
index 63945c5c13..1e05469852 100644
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -29,11 +29,9 @@
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 # define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2"
 
@@ -269,10 +267,8 @@ gnutls_ocsp_resp_list_import2(gnutls_ocsp_resp_t ** ocsps,
 			      const gnutls_datum_t * resp_data,
 			      gnutls_x509_crt_fmt_t format, unsigned int flags);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_OCSP_H */
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 6c4dd5d827..1e1b1a2f3b 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -30,11 +30,9 @@
 # include <gnutls/gnutls.h>
 # include <limits.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 /* Openpgp certificate stuff
  */
@@ -424,10 +422,8 @@ int gnutls_certificate_set_openpgp_keyring_file
     (gnutls_certificate_credentials_t c, const char *file,
      gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_OPENPGP_H */
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index ba0e1addc8..4e6606eb59 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -28,11 +28,9 @@
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 # define GNUTLS_PKCS11_MAX_PIN_LEN 256
 
@@ -491,10 +489,8 @@ gnutls_pkcs11_copy_attached_extension(const char *token_url,
 
 # define gnutls_x509_crt_import_pkcs11_url gnutls_x509_crt_import_url
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_PKCS11_H */
diff --git a/lib/includes/gnutls/pkcs12.h b/lib/includes/gnutls/pkcs12.h
index 1f4874eb8c..ad35089ceb 100644
--- a/lib/includes/gnutls/pkcs12.h
+++ b/lib/includes/gnutls/pkcs12.h
@@ -25,11 +25,9 @@
 
 # include <gnutls/x509.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 	/* PKCS12 structures handling
 	 */
@@ -138,10 +136,8 @@ int gnutls_pkcs12_bag_get_friendly_name(gnutls_pkcs12_bag_t bag,
 int gnutls_pkcs12_bag_set_friendly_name(gnutls_pkcs12_bag_t bag,
 					unsigned indx, const char *name);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_PKCS12_H */
diff --git a/lib/includes/gnutls/pkcs7.h b/lib/includes/gnutls/pkcs7.h
index b6a223ed9c..777c0002f6 100644
--- a/lib/includes/gnutls/pkcs7.h
+++ b/lib/includes/gnutls/pkcs7.h
@@ -31,11 +31,9 @@
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 /* PKCS7 structures handling
  */
@@ -149,10 +147,8 @@ int gnutls_pkcs7_print_signature_info(gnutls_pkcs7_signature_info_st * info,
 				      gnutls_certificate_print_formats_t format,
 				      gnutls_datum_t * out);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_PKCS7_H */
diff --git a/lib/includes/gnutls/socket.h b/lib/includes/gnutls/socket.h
index 9669e142eb..ccf24a76e8 100644
--- a/lib/includes/gnutls/socket.h
+++ b/lib/includes/gnutls/socket.h
@@ -31,11 +31,9 @@
 /* Get socklen_t */
 # include <sys/socket.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 void gnutls_transport_set_fastopen(gnutls_session_t session,
 				   int fd,
@@ -43,10 +41,8 @@ void gnutls_transport_set_fastopen(gnutls_session_t session,
 				   socklen_t connect_addrlen,
 				   unsigned int flags);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_SOCKET_H */
diff --git a/lib/includes/gnutls/system-keys.h b/lib/includes/gnutls/system-keys.h
index 9b58451462..f392fcfa8e 100644
--- a/lib/includes/gnutls/system-keys.h
+++ b/lib/includes/gnutls/system-keys.h
@@ -31,11 +31,9 @@
  * they will be requested through the pin callbacks.
  */
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 struct system_key_iter_st;
 typedef struct system_key_iter_st *gnutls_system_key_iter_t;
@@ -54,10 +52,8 @@ int gnutls_system_key_add_x509(gnutls_x509_crt_t crt,
 			       gnutls_x509_privkey_t privkey, const char *label,
 			       char **cert_url, char **key_url);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_SYSTEM_KEYS_H */
diff --git a/lib/includes/gnutls/tpm.h b/lib/includes/gnutls/tpm.h
index f899bd46d6..e54e0bbf66 100644
--- a/lib/includes/gnutls/tpm.h
+++ b/lib/includes/gnutls/tpm.h
@@ -26,11 +26,9 @@
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 struct tpm_key_list_st;
 typedef struct tpm_key_list_st *gnutls_tpm_key_list_t;
@@ -71,10 +69,8 @@ int gnutls_tpm_get_registered(gnutls_tpm_key_list_t * list);
 int gnutls_tpm_privkey_delete(const char *url, const char *srk_password);
 
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_TPM_H */
diff --git a/lib/includes/gnutls/urls.h b/lib/includes/gnutls/urls.h
index 87ab5e6db5..3f2ef45a80 100644
--- a/lib/includes/gnutls/urls.h
+++ b/lib/includes/gnutls/urls.h
@@ -31,11 +31,9 @@
  * keys and certificates.
  */
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 typedef int (*gnutls_privkey_import_url_func)(gnutls_privkey_t pkey,
 					      const char *url, unsigned flags);
@@ -71,10 +69,8 @@ typedef struct gnutls_custom_url_st {
 
 int gnutls_register_custom_url(const gnutls_custom_url_st * st);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_URLS_H */
diff --git a/lib/includes/gnutls/x509-ext.h b/lib/includes/gnutls/x509-ext.h
index a164e4af73..c0fa233b5a 100644
--- a/lib/includes/gnutls/x509-ext.h
+++ b/lib/includes/gnutls/x509-ext.h
@@ -28,11 +28,9 @@
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 typedef struct gnutls_subject_alt_names_st *gnutls_subject_alt_names_t;
 
@@ -215,10 +213,8 @@ int gnutls_x509_ct_sct_get(const gnutls_x509_ct_scts_t scts, unsigned idx,
 			   gnutls_sign_algorithm_t * sigalg,
 			   gnutls_datum_t * signature);
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_X509_EXT_H */
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 38db3082c0..d5a5e8e914 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -30,11 +30,9 @@
 
 # include <gnutls/gnutls.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* *INDENT-ON* */
 
 /* Some OIDs usually found in Distinguished names, or
  * in Subject Directory Attribute extensions.
@@ -1710,10 +1708,8 @@ gnutls_x509_ext_print(gnutls_x509_ext_st * exts, unsigned int exts_size,
 
 # include <gnutls/pkcs7.h>
 
-/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-/* *INDENT-ON* */
 
 #endif				/* GNUTLS_X509_H */
diff --git a/tests/test-chains-issuer-aia.h b/tests/test-chains-issuer-aia.h
index 724c0e2d1e..3bd8415a3d 100644
--- a/tests/test-chains-issuer-aia.h
+++ b/tests/test-chains-issuer-aia.h
@@ -23,8 +23,6 @@
 #ifndef GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H
 # define GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H
 
-/* *INDENT-OFF* */
-
 #define MAX_CHAIN 1
 
 static const char *missing_cert_aia[] = {
@@ -132,6 +130,4 @@ static const char *missing_cert_aia_ca[] = {
 #  pragma GCC diagnostic pop
 #endif
 
-/* *INDENT-ON* */
-
 #endif				/* GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H */
diff --git a/tests/test-chains.h b/tests/test-chains.h
index 6355f28447..69d430e65f 100644
--- a/tests/test-chains.h
+++ b/tests/test-chains.h
@@ -23,8 +23,6 @@
 #ifndef GNUTLS_TESTS_TEST_CHAINS_H
 # define GNUTLS_TESTS_TEST_CHAINS_H
 
-/* *INDENT-OFF* */
-
 #define MAX_CHAIN 10
 
 static const char *chain_with_no_subject_id_in_ca_ok[] = {
@@ -4449,6 +4447,4 @@ static struct
 #  pragma GCC diagnostic pop
 #endif
 
-/* *INDENT-ON* */
-
 #endif				/* GNUTLS_TESTS_TEST_CHAINS_H */