summary refs log tree commit diff stats
path: root/crypto
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-06-29 10:12:57 +0200
committerMarkus Armbruster <armbru@redhat.com>2016-07-12 16:19:16 +0200
commit121d07125bb6d7079c7ebafdd3efe8c3a01cc440 (patch)
treef6201b5906fcb3bfd73aeb1ce74e104249b41c27 /crypto
parent85aad98a0e0a93c146fd4c306114f23824a3db5f (diff)
downloadfocaccia-qemu-121d07125bb6d7079c7ebafdd3efe8c3a01cc440.tar.gz
focaccia-qemu-121d07125bb6d7079c7ebafdd3efe8c3a01cc440.zip
Clean up header guards that don't match their file name
Header guard symbols should match their file name to make guard
collisions less likely.  Offenders found with
scripts/clean-header-guards.pl -vn.

Cleaned up with scripts/clean-header-guards.pl, followed by some
renaming of new guard symbols picked by the script to better ones.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/blockpriv.h6
-rw-r--r--crypto/ivgenpriv.h6
-rw-r--r--crypto/tlscredspriv.h7
3 files changed, 9 insertions, 10 deletions
diff --git a/crypto/blockpriv.h b/crypto/blockpriv.h
index 62970859d0..15b547d952 100644
--- a/crypto/blockpriv.h
+++ b/crypto/blockpriv.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_BLOCK_PRIV_H__
-#define QCRYPTO_BLOCK_PRIV_H__
+#ifndef QCRYPTO_BLOCKPRIV_H
+#define QCRYPTO_BLOCKPRIV_H
 
 #include "crypto/block.h"
 
@@ -89,4 +89,4 @@ int qcrypto_block_encrypt_helper(QCryptoCipher *cipher,
                                  size_t len,
                                  Error **errp);
 
-#endif /* QCRYPTO_BLOCK_PRIV_H__ */
+#endif /* QCRYPTO_BLOCKPRIV_H */
diff --git a/crypto/ivgenpriv.h b/crypto/ivgenpriv.h
index 7b87e02ea7..28e5c67383 100644
--- a/crypto/ivgenpriv.h
+++ b/crypto/ivgenpriv.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_IVGEN_PRIV_H__
-#define QCRYPTO_IVGEN_PRIV_H__
+#ifndef QCRYPTO_IVGENPRIV_H
+#define QCRYPTO_IVGENPRIV_H
 
 #include "crypto/ivgen.h"
 
@@ -46,4 +46,4 @@ struct QCryptoIVGen {
 };
 
 
-#endif /* QCRYPTO_IVGEN_PRIV_H__ */
+#endif /* QCRYPTO_IVGENPRIV_H */
diff --git a/crypto/tlscredspriv.h b/crypto/tlscredspriv.h
index 9222be4a9e..13e9b6c0b2 100644
--- a/crypto/tlscredspriv.h
+++ b/crypto/tlscredspriv.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QCRYPTO_TLSCRED_PRIV_H__
-#define QCRYPTO_TLSCRED_PRIV_H__
+#ifndef QCRYPTO_TLSCREDSPRIV_H
+#define QCRYPTO_TLSCREDSPRIV_H
 
 #include "crypto/tlscreds.h"
 
@@ -38,5 +38,4 @@ int qcrypto_tls_creds_get_dh_params_file(QCryptoTLSCreds *creds,
 
 #endif
 
-#endif /* QCRYPTO_TLSCRED_PRIV_H__ */
-
+#endif /* QCRYPTO_TLSCREDSPRIV_H */