diff options
| author | Nathaniel McCallum <npmccallum@redhat.com> | 2016-05-24 10:18:43 -0400 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-05-29 14:04:45 +0200 |
| commit | 4bafba06f2b8cc51cd95a725e1c8adf7bbf9a5fc (patch) | |
| tree | 25c3e7a633daac2d6e08a7031580f9d12b0cadf4 /daemons/ipa-slapi-plugins | |
| parent | 9cbb54db99eb1855a5c840699072ead9b6d75d04 (diff) | |
| download | freeipa-4bafba06f2b8cc51cd95a725e1c8adf7bbf9a5fc.tar.gz freeipa-4bafba06f2b8cc51cd95a725e1c8adf7bbf9a5fc.tar.xz freeipa-4bafba06f2b8cc51cd95a725e1c8adf7bbf9a5fc.zip | |
Migrate from #ifndef guards to #pragma once
Using a pragma instead of guards is easier to write, less error prone
and avoids name clashes (a source of very subtle bugs). This pragma
is supported on almost all compilers, including all the compilers we
care about: https://en.wikipedia.org/wiki/Pragma_once#Portability.
This patch does not change the autogenerated files: asn1/asn1c/*.h.
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'daemons/ipa-slapi-plugins')
6 files changed, 6 insertions, 22 deletions
diff --git a/daemons/ipa-slapi-plugins/common/util.h b/daemons/ipa-slapi-plugins/common/util.h index eb3ddc0b9..1eaf47fac 100644 --- a/daemons/ipa-slapi-plugins/common/util.h +++ b/daemons/ipa-slapi-plugins/common/util.h @@ -34,8 +34,7 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#ifndef _SLAPI_PLUGINS_UTIL_H -#define _SLAPI_PLUGINS_UTIL_H +#pragma once #define EOK 0 #define EFAIL -1 @@ -72,5 +71,3 @@ slapi_log_error(SLAPI_LOG_TRACE, log_func, fmt, ##__VA_ARGS__) #define LOG_OOM() LOG_FATAL("Out of Memory!\n") - -#endif /* _SLAPI_PLUGINS_UTIL_H */ diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap.h b/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap.h index 5e963e3f8..a3ebfbfe2 100644 --- a/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap.h +++ b/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap.h @@ -37,8 +37,7 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#ifndef _IPA_CLDAP_H_ -#define _IPA_CLDAP_H_ +#pragma once #ifdef HAVE_CONFIG_H # include <config.h> @@ -108,4 +107,3 @@ int ipa_cldap_netlogon(struct ipa_cldap_ctx *ctx, struct berval *reply); char *make_netbios_name(TALLOC_CTX *mem_ctx, const char *s); -#endif /* _IPA_CLDAP_H_ */ diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom.h b/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom.h index a77711977..e121b8ba5 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom.h +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom.h @@ -37,8 +37,7 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#ifndef _IPA_EXTDOM_H_ -#define _IPA_EXTDOM_H_ +#pragma once #ifdef HAVE_CONFIG_H # include <config.h> @@ -202,4 +201,3 @@ int pack_ber_group(enum response_types response_type, gid_t gid, char **members, struct sss_nss_kv *kv_list, struct berval **berval); void set_err_msg(struct extdom_req *req, const char *format, ...); -#endif /* _IPA_EXTDOM_H_ */ diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/otpctrl.h b/daemons/ipa-slapi-plugins/ipa-pwd-extop/otpctrl.h index 4cbc17b99..51d77a0b5 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/otpctrl.h +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/otpctrl.h @@ -37,9 +37,7 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ - -#ifndef OTPCTRL_H_ -#define OTPCTRL_H_ +#pragma once #include "../libotp/otp_config.h" #include <stdbool.h> @@ -62,5 +60,3 @@ bool otpctrl_present(Slapi_PBlock *pb, const char *oid); bool otpctrl_sync_handle(const struct otp_config *cfg, Slapi_PBlock *pb, const char *user_dn); - -#endif /* OTPCTRL_H_ */ diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h index dec2a6524..0feff7eec 100644 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h @@ -37,8 +37,7 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#ifndef _IPA_SIDGEN_H_ -#define _IPA_SIDGEN_H_ +#pragma once #define OBJECTCLASS "objectclass" #define IPA_OBJECT "ipaobject" @@ -105,4 +104,3 @@ int find_sid_for_ldap_entry(struct slapi_entry *entry, const char *base_dn, const char *dom_sid, struct range_info **ranges); -#endif /* _IPA_SIDGEN_H_ */ diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h index 664af32a7..a3200b00e 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h +++ b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h @@ -37,8 +37,7 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#ifndef IPA_WINSYNC_H -#define IPA_WINSYNC_H +#pragma once #ifdef HAVE_CONFIG_H # include <config.h> @@ -172,5 +171,3 @@ enum { #define IPA_WINSYNC_UPG_DEF_DN "cn=UPG Definition,cn=Definitions,cn=Managed Entries,cn=etc,%s" #define IPA_WINSYNC_UPG_DEF_ATTR "originfilter" #define IPA_WINSYNC_UPG_DEF_DISABLED "(objectclass=disable)" - -#endif /* IPA_WINSYNC_H */ |