From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sun, 19 Jan 2003 13:38:44 +0000 (+0000)
Subject: Insert missing initializers, to silence gcc warnings.
X-Git-Tag: NO_SLAP_OP_BLOCKS~610
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=265b7e22c6d756d4ff723a06812c598e4ecf55df;p=openldap

Insert missing initializers, to silence gcc warnings.
---

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 7b14ca03a0..fa627523e5 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -126,7 +126,7 @@ main( int argc, char *argv[] )
 	char	*user = NULL;
 
 	LDAP	       *ld = NULL;
-	struct berval bv = {0};
+	struct berval bv = {0, NULL};
 	BerElement  *ber = NULL;
 
 	int id, code = LDAP_OTHER;
diff --git a/libraries/libldap/passwd.c b/libraries/libldap/passwd.c
index e1682c5a90..e8ef6fbf27 100644
--- a/libraries/libldap/passwd.c
+++ b/libraries/libldap/passwd.c
@@ -71,7 +71,7 @@ ldap_passwd( LDAP *ld,
 	int				*msgidp )
 {
 	int rc;
-	struct berval bv = {0};
+	struct berval bv = {0, NULL};
 	BerElement *ber = NULL;
 
 	assert( ld != NULL );
diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 113c378eac..2e94258602 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -274,7 +274,7 @@ presence_candidates(
 	DB *db;
 	int rc;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 
 #ifdef NEW_LOGGING
 	LDAP_LOG ( INDEX, ENTRY, "=> bdb_presence_candidates\n", 0, 0, 0 );
@@ -371,7 +371,7 @@ equality_candidates(
 	int i;
 	int rc;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 	struct berval *keys = NULL;
 	MatchingRule *mr;
 
@@ -516,7 +516,7 @@ approx_candidates(
 	int i;
 	int rc;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 	struct berval *keys = NULL;
 	MatchingRule *mr;
 
@@ -663,7 +663,7 @@ substring_candidates(
 	int i;
 	int rc;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 	struct berval *keys = NULL;
 	MatchingRule *mr;
 
diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index 8a67cd97c0..ff07968cd9 100644
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -219,7 +219,7 @@ presence_candidates(
 	int rc;
 	char *dbname;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 
 #ifdef NEW_LOGGING
 	LDAP_LOG( FILTER, ENTRY, "presence_candidates: enter\n", 0, 0, 0 );
@@ -333,7 +333,7 @@ equality_candidates(
 	int rc;
 	char *dbname;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 	struct berval *keys = NULL;
 	MatchingRule *mr;
 
@@ -507,7 +507,7 @@ approx_candidates(
 	int rc;
 	char *dbname;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 	struct berval *keys = NULL;
 	MatchingRule *mr;
 
@@ -742,7 +742,7 @@ substring_candidates(
 	int rc;
 	char *dbname;
 	slap_mask_t mask;
-	struct berval prefix = {0};
+	struct berval prefix = {0, NULL};
 	struct berval *keys = NULL;
 	MatchingRule *mr;
 
diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index ba40849723..ba839c13ce 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -295,7 +295,7 @@ glue_back_search (
 	BackendDB *be;
 	int i, rc = 0, t2limit = 0, s2limit = 0;
 	long stoptime = 0;
-	glue_state gs = {0};
+	glue_state gs = {0, 0, 0, NULL, 0, NULL, NULL};
 	slap_callback cb;
 
 	cb.sc_response = glue_back_response;
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 9b8658fa77..0eba5c92d2 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -44,7 +44,7 @@ do_compare(
 	struct berval ndn = { 0, NULL };
 	struct berval desc = { 0, NULL };
 	struct berval value = { 0, NULL };
-	AttributeAssertion ava = { 0 };
+	AttributeAssertion ava = { NULL, { 0, NULL } };
 	Backend	*be;
 	int rc = LDAP_SUCCESS;
 	const char *text = NULL;
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index c2a7ce13dd..0a13f7d6cc 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -97,7 +97,7 @@ static struct slap_control {
 		SLAP_CTRL_SEARCH, NULL,
 		parseClientUpdate },
 #endif /* LDAP_CLIENT_UPDATE */
-	{ NULL }
+	{ NULL, 0, NULL, 0 }
 };
 
 char *
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 6c18fda281..2e0f46fb54 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -84,7 +84,7 @@ static STRDISP	syslog_types[] = {
 	{ "LOCAL5", sizeof("LOCAL5"), LOG_LOCAL5 },
 	{ "LOCAL6", sizeof("LOCAL6"), LOG_LOCAL6 },
 	{ "LOCAL7", sizeof("LOCAL7"), LOG_LOCAL7 },
-	{ NULL }
+	{ NULL, 0, 0 }
 };
 
 static int   cnvt_str2int( char *, STRDISP_P, int );
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 1df9e8e3aa..907ddd3777 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -764,13 +764,13 @@ static struct slap_schema_ad_map {
 		offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif
 
-	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, 0 }
+	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0 }
 };
 
 static AttributeType slap_at_undefined = {
 	{ "1.1.1", NULL, NULL, 1, NULL,
 		NULL, NULL, NULL, NULL,
-		0, 0, 0, 1, 3 }, /* LDAPAttributeType */
+		0, 0, 0, 1, 3, NULL }, /* LDAPAttributeType */
 	{ sizeof("UNDEFINED")-1, "UNDEFINED" }, /* cname */
 	NULL, /* sup */
 	NULL, /* subtypes */