X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmra.c;h=1e7a7e63782af0f8d48e586741c2a0938147aa81;hb=b94d5e17e22b58b990dac4d4af5319be915366a6;hp=ce4a86def0bee0321f33e761f105771f047fa03b;hpb=ece7452b05fcbbb14823e113b683365a59f81f05;p=openldap

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index ce4a86def0..1e7a7e6378 100644
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -1,9 +1,18 @@
+/* mra.c - routines for dealing with extensible matching rule assertions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* mra.c - routines for dealing with extensible matching rule assertions */
 
 #include "portable.h"
 
@@ -18,14 +27,11 @@ void
 mra_free(
 	Operation *op,
 	MatchingRuleAssertion *mra,
-	int	freeit
-)
+	int	freeit )
 {
 	/* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */
 	ch_free( mra->ma_value.bv_val );
-	if ( freeit ) {
-		op->o_tmpfree( (char *) mra, op->o_tmpmemctx );
-	}
+	if ( freeit ) op->o_tmpfree( (char *) mra, op->o_tmpmemctx );
 }
 
 int
@@ -33,15 +39,14 @@ get_mra(
 	Operation *op,
 	BerElement	*ber,
 	MatchingRuleAssertion	**mra,
-	const char **text
-)
+	const char **text )
 {
 	int rc;
 	ber_tag_t tag, rtag;
 	ber_len_t length;
-	struct berval type = { 0, NULL };
-	struct berval value = { 0, NULL };
-	struct berval rule_text = { 0, NULL };
+	struct berval type = BER_BVNULL;
+	struct berval value = BER_BVNULL;
+	struct berval rule_text = BER_BVNULL;
 	MatchingRuleAssertion ma;
 
 	memset( &ma, 0, sizeof ma);