s3: Fix some nonempty blank lines
authorVolker Lendecke <vl@samba.org>
Sun, 7 Feb 2010 14:01:57 +0000 (15:01 +0100)
committerVolker Lendecke <vl@samba.org>
Sat, 13 Feb 2010 12:26:10 +0000 (13:26 +0100)
source3/lib/adt_tree.c

index 6ac498d9e62ae0884471ca16c85a4fcb55efdaf7..d97d12ef2db4d74b65d5e098458c5f565da60fae 100644 (file)
 static bool trim_tree_keypath( char *path, char **base, char **new_path )
 {
        char *p;
-       
+
        *new_path = *base = NULL;
-       
+
        if ( !path )
                return False;
-       
+
        *base = path;
-       
+
        p = strchr( path, '/' );
-       
+
        if ( p ) {
                *p = '\0';
                *new_path = p+1;
        }
-       
+
        return True;
 }
 
 /**************************************************************************
  Initialize the tree's root.  The cmp_fn is a callback function used
  for comparision of two children
@@ -54,19 +53,19 @@ static bool trim_tree_keypath( char *path, char **base, char **new_path )
  SORTED_TREE* pathtree_init( void *data_p, int (cmp_fn)(void*, void*) )
 {
        SORTED_TREE *tree = NULL;
-       
+
        if ( !(tree = TALLOC_ZERO_P(NULL, SORTED_TREE)) )
                return NULL;
-               
+
        tree->compare = cmp_fn;
-       
+
        if ( !(tree->root = TALLOC_ZERO_P(tree, TREE_NODE)) ) {
                TALLOC_FREE( tree );
                return NULL;
        }
-       
+
        tree->root->data_p = data_p;
-       
+
        return tree;
 }
 
@@ -80,22 +79,22 @@ static TREE_NODE* pathtree_birth_child( TREE_NODE *node, char* key )
        TREE_NODE *infant = NULL;
        TREE_NODE **siblings;
        int i;
-       
+
        if ( !(infant = TALLOC_ZERO_P( node, TREE_NODE)) )
                return NULL;
-       
+
        infant->key = talloc_strdup( infant, key );
        infant->parent = node;
-       
+
        siblings = TALLOC_REALLOC_ARRAY( node, node->children, TREE_NODE *, node->num_children+1 );
-       
+
        if ( siblings )
                node->children = siblings;
-       
+
        node->num_children++;
-       
+
        /* first child */
-       
+
        if ( node->num_children == 1 ) {
                DEBUG(11,("pathtree_birth_child: First child of node [%s]! [%s]\n", 
                        node->key ? node->key : "NULL", infant->key ));
@@ -111,32 +110,32 @@ static TREE_NODE* pathtree_birth_child( TREE_NODE *node, char* key )
                 * Insert the new infanct in ascending order 
                 * from left to right
                 */
-       
+
                for ( i = node->num_children-1; i>=1; i-- )
                {
                        DEBUG(11,("pathtree_birth_child: Looking for crib; infant -> [%s], child -> [%s]\n",
                                infant->key, node->children[i-1]->key));
-                       
+
                        /* the strings should never match assuming that we 
                           have called pathtree_find_child() first */
-               
+
                        if ( StrCaseCmp( infant->key, node->children[i-1]->key ) > 0 ) {
                                DEBUG(11,("pathtree_birth_child: storing infant in i == [%d]\n", 
                                        i));
                                node->children[i] = infant;
                                break;
                        }
-                       
+
                        /* bump everything towards the end on slot */
-                       
+
                        node->children[i] = node->children[i-1];
                }
 
                DEBUG(11,("pathtree_birth_child: Exiting loop (i == [%d])\n", i ));
-               
+
                /* if we haven't found the correct slot yet, the child 
                   will be first in the list */
-                  
+
                if ( i == 0 )
                        node->children[0] = infant;
        }
@@ -152,38 +151,38 @@ static TREE_NODE* pathtree_find_child( TREE_NODE *node, char* key )
 {
        TREE_NODE *next = NULL;
        int i, result;
-       
+
        if ( !node ) {
                DEBUG(0,("pathtree_find_child: NULL node passed into function!\n"));
                return NULL;
        }
-       
+
        if ( !key ) {
                DEBUG(0,("pathtree_find_child: NULL key string passed into function!\n"));
                return NULL;
        }
-       
+
        for ( i=0; i<node->num_children; i++ )
        {       
                DEBUG(11,("pathtree_find_child: child key => [%s]\n",
                        node->children[i]->key));
-                       
+
                result = StrCaseCmp( node->children[i]->key, key );
-               
+
                if ( result == 0 )
                        next = node->children[i];
-               
+
                /* if result > 0 then we've gone to far because
                   the list of children is sorted by key name 
                   If result == 0, then we have a match         */
-                  
+
                if ( result > 0 )
                        break;
        }
 
        DEBUG(11,("pathtree_find_child: %s [%s]\n",
                next ? "Found" : "Did not find", key ));        
-       
+
        return next;
 }
 
@@ -196,49 +195,49 @@ static TREE_NODE* pathtree_find_child( TREE_NODE *node, char* key )
        char *str, *base, *path2;
        TREE_NODE *current, *next;
        WERROR ret = WERR_OK;
-       
+
        DEBUG(8,("pathtree_add: Enter\n"));
-               
+
        if ( !path || *path != '/' ) {
                DEBUG(0,("pathtree_add: Attempt to add a node with a bad path [%s]\n",
                        path ? path : "NULL" ));
                return WERR_INVALID_PARAM;
        }
-       
+
        if ( !tree ) {
                DEBUG(0,("pathtree_add: Attempt to add a node to an uninitialized tree!\n"));
                return WERR_INVALID_PARAM;
        }
-       
+
        /* move past the first '/' */
-       
+
        path++; 
        path2 = SMB_STRDUP( path );
        if ( !path2 ) {
                DEBUG(0,("pathtree_add: strdup() failed on string [%s]!?!?!\n", path));
                return WERR_NOMEM;
        }
-       
+
 
        /* 
         * this works sort of like a 'mkdir -p' call, possibly 
         * creating an entire path to the new node at once
         * The path should be of the form /<key1>/<key2>/...
         */
-       
+
        base = path2;
        str  = path2;
        current = tree->root;
-       
+
        do {
                /* break off the remaining part of the path */
-               
+
                str = strchr( str, '/' );
                if ( str )
                        *str = '\0';
-                       
+
                /* iterate to the next child--birth it if necessary */
-               
+
                next = pathtree_find_child( current, base );
                if ( !next ) {
                        next = pathtree_birth_child( current, base );
@@ -249,20 +248,20 @@ static TREE_NODE* pathtree_find_child( TREE_NODE *node, char* key )
                        }
                }
                current = next;
-               
+
                /* setup the next part of the path */
-               
+
                base = str;
                if ( base ) {
                        *base = '/';
                        base++;
                        str = base;
                }
-       
+
        } while ( base != NULL );
-       
+
        current->data_p = data_p;
-       
+
        DEBUG(10,("pathtree_add: Successfully added node [%s] to tree\n",
                path ));
 
@@ -348,82 +347,82 @@ static void pathtree_print_children(TALLOC_CTX *ctx,
        char *keystr, *base = NULL, *str = NULL, *p;
        TREE_NODE *current;
        void *result = NULL;
-       
+
        DEBUG(10,("pathtree_find: Enter [%s]\n", key ? key : "NULL" ));
 
        /* sanity checks first */
-       
+
        if ( !key ) {
                DEBUG(0,("pathtree_find: Attempt to search tree using NULL search string!\n"));
                return NULL;
        }
-       
+
        if ( !tree ) {
                DEBUG(0,("pathtree_find: Attempt to search an uninitialized tree using string [%s]!\n",
                        key ? key : "NULL" ));
                return NULL;
        }
-       
+
        if ( !tree->root )
                return NULL;
-       
+
        /* make a copy to play with */
-       
+
        if ( *key == '/' )
                keystr = SMB_STRDUP( key+1 );
        else
                keystr = SMB_STRDUP( key );
-       
+
        if ( !keystr ) {
                DEBUG(0,("pathtree_find: strdup() failed on string [%s]!?!?!\n", key));
                return NULL;
        }
 
        /* start breaking the path apart */
-       
+
        p = keystr;
        current = tree->root;
-       
+
        if ( tree->root->data_p )
                result = tree->root->data_p;
-               
+
        do
        {
                /* break off the remaining part of the path */
 
                trim_tree_keypath( p, &base, &str );
-                       
+
                DEBUG(11,("pathtree_find: [loop] base => [%s], new_path => [%s]\n", 
                        base ? base : "",
                        str ? str : ""));
 
                /* iterate to the next child */
-               
+
                current = pathtree_find_child( current, base );
-       
+
                /* 
                 * the idea is that the data_p for a parent should 
                 * be inherited by all children, but allow it to be 
                 * overridden farther down
                 */
-               
+
                if ( current && current->data_p )
                        result = current->data_p;
 
                /* reset the path pointer 'p' to the remaining part of the key string */
 
                p = str;
-          
+
        } while ( str && current );
-       
+
        /* result should be the data_p from the lowest match node in the tree */
        if ( result )
                DEBUG(11,("pathtree_find: Found data_p!\n"));
-       
+
        SAFE_FREE( keystr );
-       
+
        DEBUG(10,("pathtree_find: Exit\n"));
-       
+
        return result;
 }