summaryrefslogtreecommitdiff
path: root/include/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 /include/crypto
parent85aad98a0e0a93c146fd4c306114f23824a3db5f (diff)
downloadqemu-121d07125bb6d7079c7ebafdd3efe8c3a01cc440.tar.gz
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 'include/crypto')
-rw-r--r--include/crypto/desrfb.h5
-rw-r--r--include/crypto/tlscreds.h7
-rw-r--r--include/crypto/tlscredsanon.h7
-rw-r--r--include/crypto/tlscredsx509.h7
-rw-r--r--include/crypto/tlssession.h6
5 files changed, 15 insertions, 17 deletions
diff --git a/include/crypto/desrfb.h b/include/crypto/desrfb.h
index 773667ee79..7ca596c387 100644
--- a/include/crypto/desrfb.h
+++ b/include/crypto/desrfb.h
@@ -9,8 +9,9 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef D3DES_H
-#define D3DES_H 1
+
+#ifndef QCRYPTO_DESRFB_H
+#define QCRYPTO_DESRFB_H
/* d3des.h -
*
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index 59e91875c1..ad47d88be7 100644
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef QCRYPTO_TLSCRED_H__
-#define QCRYPTO_TLSCRED_H__
+#ifndef QCRYPTO_TLSCREDS_H
+#define QCRYPTO_TLSCREDS_H
#include "qom/object.h"
@@ -63,5 +63,4 @@ struct QCryptoTLSCredsClass {
};
-#endif /* QCRYPTO_TLSCRED_H__ */
-
+#endif /* QCRYPTO_TLSCREDS_H */
diff --git a/include/crypto/tlscredsanon.h b/include/crypto/tlscredsanon.h
index d3976b84b9..4d6b7e4d29 100644
--- a/include/crypto/tlscredsanon.h
+++ b/include/crypto/tlscredsanon.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef QCRYPTO_TLSCRED_ANON_H__
-#define QCRYPTO_TLSCRED_ANON_H__
+#ifndef QCRYPTO_TLSCREDSANON_H
+#define QCRYPTO_TLSCREDSANON_H
#include "crypto/tlscreds.h"
@@ -108,5 +108,4 @@ struct QCryptoTLSCredsAnonClass {
};
-#endif /* QCRYPTO_TLSCRED_H__ */
-
+#endif /* QCRYPTO_TLSCREDSANON_H */
diff --git a/include/crypto/tlscredsx509.h b/include/crypto/tlscredsx509.h
index 25796d7de4..66ad6a7486 100644
--- a/include/crypto/tlscredsx509.h
+++ b/include/crypto/tlscredsx509.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef QCRYPTO_TLSCRED_X509_H__
-#define QCRYPTO_TLSCRED_X509_H__
+#ifndef QCRYPTO_TLSCREDSX509_H
+#define QCRYPTO_TLSCREDSX509_H
#include "crypto/tlscreds.h"
@@ -110,5 +110,4 @@ struct QCryptoTLSCredsX509Class {
};
-#endif /* QCRYPTO_TLSCRED_X509_H__ */
-
+#endif /* QCRYPTO_TLSCREDSX509_H */
diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h
index c1bad9e4f0..1c7414e4ff 100644
--- a/include/crypto/tlssession.h
+++ b/include/crypto/tlssession.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef QCRYPTO_TLS_SESSION_H__
-#define QCRYPTO_TLS_SESSION_H__
+#ifndef QCRYPTO_TLSSESSION_H
+#define QCRYPTO_TLSSESSION_H
#include "crypto/tlscreds.h"
@@ -319,4 +319,4 @@ int qcrypto_tls_session_get_key_size(QCryptoTLSSession *sess,
*/
char *qcrypto_tls_session_get_peer_name(QCryptoTLSSession *sess);
-#endif /* QCRYPTO_TLS_SESSION_H__ */
+#endif /* QCRYPTO_TLSSESSION_H */