From f472d3abcf25570d3b46df177b32bdd9612dad09 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 2 Jun 1999 22:40:58 +0000 Subject: [PATCH] No anonymous unions. --- clients/mail500/main.c | 2 +- clients/tools/ldappasswd.c | 2 +- libraries/liblutil/sha1.c | 2 +- servers/slapd/shell-backends/shellutil.h | 2 +- servers/slapd/slap.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/mail500/main.c b/clients/mail500/main.c index f7a9993035..dfc868ddb7 100644 --- a/clients/mail500/main.c +++ b/clients/mail500/main.c @@ -81,7 +81,7 @@ typedef struct errs { #define E_NOOWNER 11 #define E_GROUPUNKNOWN 12 char *e_addr; - union { + union e_union_u { char *e_u_loop; LDAPMessage *e_u_msg; } e_union; diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c index a3e37e1f49..cf3aee05c0 100644 --- a/clients/tools/ldappasswd.c +++ b/clients/tools/ldappasswd.c @@ -306,7 +306,7 @@ modify_dn (LDAP * ld, char *targetdn, char *pwattr, char *oldpw, strvals[0] = buf; strvals[1] = NULL; - mod.mod_vals.modv_strvals = strvals; + mod.mod_values = strvals; mod.mod_type = pwattr; mod.mod_op = LDAP_MOD_REPLACE; mods[0] = &mod; diff --git a/libraries/liblutil/sha1.c b/libraries/liblutil/sha1.c index a0df8ac95b..d68d0ce959 100644 --- a/libraries/liblutil/sha1.c +++ b/libraries/liblutil/sha1.c @@ -61,7 +61,7 @@ void lutil_SHA1Transform( uint32 *state, const unsigned char *buffer ) { uint32 a, b, c, d, e; - typedef union { + typedef union char64long16_u { unsigned char c[64]; u_int l[16]; } CHAR64LONG16; diff --git a/servers/slapd/shell-backends/shellutil.h b/servers/slapd/shell-backends/shellutil.h index 7f51500d35..119689d5fb 100644 --- a/servers/slapd/shell-backends/shellutil.h +++ b/servers/slapd/shell-backends/shellutil.h @@ -55,7 +55,7 @@ struct ldop { #define LDOP_SEARCH 0x01 char **ldop_suffixes; char *ldop_dn; - union { + union ldapop_params_u { struct ldsrchparms LDsrchparams; } ldop_params; #define ldop_srch ldop_params.LDsrchparams diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 0f5eec9e27..57a955b49d 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -79,7 +79,7 @@ typedef struct ava { typedef struct filter { unsigned long f_choice; /* values taken from ldap.h */ - union { + union f_un_u { /* present */ char *f_un_type; -- 2.39.5