libcli/security: remove useless if (root->num_of_children > 0) statements
authorAndrew Bartlett <abartlet@samba.org>
Thu, 3 Jan 2013 10:30:12 +0000 (21:30 +1100)
committerStefan Metzmacher <metze@samba.org>
Mon, 21 Jan 2013 15:12:45 +0000 (16:12 +0100)
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>
libcli/security/object_tree.c

index fb523be4a5c1e194f40578534cabb48b68194021..3e5ee109512f187ff200a1efb3a58ab5054e4a53 100644 (file)
@@ -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);
        }
 }