svn commit: samba r8414 - in branches/SAMBA_4_0/source: lib/ldb/common lib/ldb/include libcli/ldap

[tpot at samba.org]

Author: tpot
Date: 2005-07-13 05:55:28 +0000 (Wed, 13 Jul 2005)
New Revision: 8414

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

Log:
Some C++ friendlyness fixes - 'not' is apparently a keyword in C++.

Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_parse.c
   branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
   branches/SAMBA_4_0/source/libcli/ldap/ldap.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c	2005-07-13 05:32:41 UTC (rev 8413)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c	2005-07-13 05:55:28 UTC (rev 8414)
@@ -369,7 +369,7 @@
 		return ldb_match_extended(ldb, msg, tree, base, scope);
 
 	case LDB_OP_NOT:
-		return ! ldb_match_message(ldb, msg, tree->u.not.child, base, scope);
+		return ! ldb_match_message(ldb, msg, tree->u.isnot.child, base, scope);
 
 	case LDB_OP_AND:
 		for (i=0;i<tree->u.list.num_elements;i++) {

Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_parse.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_parse.c	2005-07-13 05:32:41 UTC (rev 8413)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_parse.c	2005-07-13 05:55:28 UTC (rev 8414)
@@ -459,8 +459,8 @@
 	}
 
 	ret->operation = LDB_OP_NOT;
-	ret->u.not.child = ldb_parse_filter(ret, &s);
-	if (!ret->u.not.child) {
+	ret->u.isnot.child = ldb_parse_filter(ret, &s);
+	if (!ret->u.isnot.child) {
 		talloc_free(ret);
 		return NULL;
 	}
@@ -629,7 +629,7 @@
 		}
 		return s;
 	case LDB_OP_NOT:
-		s = ldb_filter_from_tree(mem_ctx, tree->u.not.child);
+		s = ldb_filter_from_tree(mem_ctx, tree->u.isnot.child);
 		if (s == NULL) return NULL;
 
 		ret = talloc_asprintf(mem_ctx, "(!%s)", s);

Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2005-07-13 05:32:41 UTC (rev 8413)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2005-07-13 05:55:28 UTC (rev 8414)
@@ -186,7 +186,7 @@
 		} list;
 		struct {
 			struct ldb_parse_tree *child;
-		} not;
+		} isnot;
 	} u;
 };
 

Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.c	2005-07-13 05:32:41 UTC (rev 8413)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c	2005-07-13 05:55:28 UTC (rev 8414)
@@ -97,7 +97,7 @@
 
 	case LDB_OP_NOT:
 		asn1_push_tag(data, ASN1_CONTEXT(2));
-		if (!ldap_push_filter(data, tree->u.not.child)) {
+		if (!ldap_push_filter(data, tree->u.isnot.child)) {
 			return False;
 		}
 		asn1_pop_tag(data);
@@ -500,8 +500,8 @@
 		}
 
 		ret->operation = LDB_OP_NOT;
-		ret->u.not.child = ldap_decode_filter_tree(ret, data);
-		if (ret->u.not.child == NULL) {
+		ret->u.isnot.child = ldap_decode_filter_tree(ret, data);
+		if (ret->u.isnot.child == NULL) {
 			goto failed;
 		}
 		if (!asn1_end_tag(data)) {