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>
This commit is contained in:
Markus Armbruster 2016-06-29 10:12:57 +02:00
parent 85aad98a0e
commit 121d07125b
83 changed files with 223 additions and 215 deletions

View file

@ -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 -
*

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */