Commit a8b991b5 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

Clean up ill-advised or unusual header guards 



Leading underscores are ill-advised because such identifiers are
reserved.  Trailing underscores are merely ugly.  Strip both.

Our header guards commonly end in _H.  Normalize the exceptions.

Done with scripts/clean-header-guards.pl.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190315145123.28030-7-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
[Changes to slirp/ dropped, as we're about to spin it off]
parent 58ea30f5

block/crypto.h

+3 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
 *

 */



#ifndef BLOCK_CRYPTO_H__

#define BLOCK_CRYPTO_H__

#ifndef BLOCK_CRYPTO_H

#define BLOCK_CRYPTO_H



#define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr)                \

    {                                                                   \
@@ -94,4 +94,4 @@ block_crypto_create_opts_init(QDict *opts, Error **errp); 
QCryptoBlockOpenOptions *

block_crypto_open_opts_init(QDict *opts, Error **errp);



#endif /* BLOCK_CRYPTO_H__ */
 
#endif /* BLOCK_CRYPTO_H */

hw/i386/amd_iommu.h

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef AMD_IOMMU_H_

#define AMD_IOMMU_H_

#ifndef AMD_IOMMU_H

#define AMD_IOMMU_H



#include "hw/hw.h"

#include "hw/pci/pci.h"

hw/tpm/tpm_ioctl.h

+4 −3
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ 
 *

 * This file is licensed under the terms of the 3-clause BSD license

 */

#ifndef _TPM_IOCTL_H_

#define _TPM_IOCTL_H_



#ifndef TPM_IOCTL_H

#define TPM_IOCTL_H



#include <sys/uio.h>

#include <sys/ioctl.h>
@@ -267,4 +268,4 @@ enum { 
    CMD_SET_BUFFERSIZE,

};



#endif /* _TPM_IOCTL_H */
 
#endif /* TPM_IOCTL_H */

hw/xtensa/xtensa_memory.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef _XTENSA_MEMORY_H

#define _XTENSA_MEMORY_H

#ifndef XTENSA_MEMORY_H

#define XTENSA_MEMORY_H



#include "qemu-common.h"

#include "cpu.h"

include/authz/base.h

+3 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
 *

 */



#ifndef QAUTHZ_BASE_H__

#define QAUTHZ_BASE_H__

#ifndef QAUTHZ_BASE_H

#define QAUTHZ_BASE_H



#include "qemu-common.h"

#include "qapi/error.h"
@@ -108,5 +108,4 @@ bool qauthz_is_allowed_by_id(const char *authzid, 
                             const char *identity,

                             Error **errp);



#endif /* QAUTHZ_BASE_H__ */

#endif /* QAUTHZ_BASE_H */