svn commit: samba r19870 - in branches/SAMBA_4_0/source/lib/ldb/common: .

[idra at samba.org]

Author: idra
Date: 2006-11-23 22:11:47 +0000 (Thu, 23 Nov 2006)
New Revision: 19870

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19870

Log:

Simplify code


Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-11-23 22:06:07 UTC (rev 19869)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-11-23 22:11:47 UTC (rev 19870)
@@ -62,7 +62,6 @@
 	bool special;
 	bool invalid;
 
-	bool valid_lin;
 	bool valid_comp;
 	bool valid_case;
 
@@ -102,8 +101,6 @@
 	}
 	LDB_DN_NULL_FAILED(dn->linearized);
 
-	dn->valid_lin = true;
-
 	return dn;
 
 failed:
@@ -140,8 +137,6 @@
 	}
 	dn->linearized = strdn;
 
-	dn->valid_lin = true;
-
 	return dn;
 
 failed:
@@ -230,7 +225,7 @@
 		return true;
 	}
 
-	if ( ! dn->valid_lin) {
+	if ( ! dn->linearized) {
 		return false;
 	}
 
@@ -534,7 +529,7 @@
 
 	if ( ! dn || ( dn->invalid)) return NULL;
 
-	if (dn->valid_lin) return dn->linearized;
+	if (dn->linearized) return dn->linearized;
 
 	if ( ! dn->valid_comp) {
 		dn->invalid = true;
@@ -544,7 +539,6 @@
 	if (dn->comp_num == 0) {
 		dn->linearized = talloc_strdup(dn, "");
 		if ( ! dn->linearized) return NULL;
-		dn->valid_lin = true;
 		return dn->linearized;
 	}
 
@@ -576,8 +570,6 @@
 
 	*(--d) = '\0';
 
-	dn->valid_lin = true;
-
 	/* don't waste more memory than necessary */
 	dn->linearized = talloc_realloc(dn, dn->linearized, char, (d - dn->linearized + 1));
 
@@ -714,7 +706,7 @@
 	if ( ! dn || dn->invalid) return -1;
 
 	if (( ! base->valid_case) || ( ! dn->valid_case)) {
-		if (base->valid_lin && dn->valid_lin) {
+		if (base->linearized && dn->linearized) {
 			/* try with a normal compare first, if we are lucky
 			 * we will avoid exploding and casfolding */
 			int dif;
@@ -785,7 +777,7 @@
 	if (( ! dn0) || dn0->invalid || ! dn1 || dn1->invalid) return -1;
 
 	if (( ! dn0->valid_case) || ( ! dn1->valid_case)) {
-		if (dn0->valid_lin && dn1->valid_lin) {
+		if (dn0->linearized && dn1->linearized) {
 			/* try with a normal compare first, if we are lucky
 			 * we will avoid exploding and casfolding */
 			if (strcmp(dn0->linearized, dn1->linearized) == 0) return 0;
@@ -918,7 +910,7 @@
 		}
 	}
 
-	if (dn->valid_lin) {
+	if (dn->linearized) {
 		new_dn->linearized = talloc_strdup(new_dn, dn->linearized);
 		if ( ! new_dn->linearized) {
 			talloc_free(new_dn);
@@ -981,7 +973,7 @@
 		}
 	}
 
-	if (dn->valid_lin) {
+	if (dn->linearized) {
 
 		s = ldb_dn_get_linearized(base);
 		if ( ! s) {
@@ -1093,7 +1085,7 @@
 		}
 	}
 
-	if (dn->valid_lin) {
+	if (dn->linearized) {
 
 		s = ldb_dn_get_linearized(child);
 		if ( ! s) {
@@ -1173,13 +1165,10 @@
 			LDB_FREE(dn->components[i].cf_value.data);
 		}
 		dn->valid_case = false;
-		LDB_FREE(dn->casefold);
 	}
 
-	if (dn->valid_lin) {	
-		dn->valid_lin = false;
-		LDB_FREE(dn->linearized);
-	}
+	LDB_FREE(dn->casefold);
+	LDB_FREE(dn->linearized);
 
 	return true;
 }
@@ -1215,13 +1204,10 @@
 		}
 		dn->valid_case = false;
 	}
+
 	LDB_FREE(dn->casefold);
+	LDB_FREE(dn->linearized);
 
-	if (dn->valid_lin) {	
-		dn->valid_lin = false;
-		LDB_FREE(dn->linearized);
-	}
-
 	return true;
 }