From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 3 Jan 2013 10:30:12 +0000 (+1100)
Subject: libcli/security: remove useless if (root->num_of_children > 0) statements
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=d36c03056fb85dfedbafd3a59497e35db63ade17;p=metze%2Fsamba%2Fwip.git

libcli/security: remove useless if (root->num_of_children > 0) statements

The for loop does this implicitly when comparing for (i = 0; i < root->num_of_children; i++)

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/libcli/security/object_tree.c b/libcli/security/object_tree.c
index fb523be4a5c1..3e5ee109512f 100644
--- a/libcli/security/object_tree.c
+++ b/libcli/security/object_tree.c
@@ -97,11 +97,9 @@ struct object_tree *get_object_tree_by_GUID(struct object_tree *root,
 		result = root;
 		return result;
 	}
-	else if (root->num_of_children > 0) {
-		for (i = 0; i < root->num_of_children; i++) {
+	for (i = 0; i < root->num_of_children; i++) {
 		if ((result = get_object_tree_by_GUID(&root->children[i], guid)))
 			break;
-		}
 	}
 	return result;
 }
@@ -111,11 +109,9 @@ struct object_tree *get_object_tree_by_GUID(struct object_tree *root,
 void object_tree_modify_access(struct object_tree *root,
 			       uint32_t access_mask)
 {
+	int i;
 	root->remaining_access &= ~access_mask;
-	if (root->num_of_children > 0) {
-		int i;
-		for (i = 0; i < root->num_of_children; i++) {
-			object_tree_modify_access(&root->children[i], access_mask);
-		}
+	for (i = 0; i < root->num_of_children; i++) {
+		object_tree_modify_access(&root->children[i], access_mask);
 	}
 }