All implementations of lutil_lockf (aka ldap_lockf) block until

[openldap] / libraries / libavl / testavl.c

diff --git a/libraries/libavl/testavl.c b/libraries/libavl/testavl.c
index 9d7b9c7d13b0b2518bb7c45d1e8f9f863066d327..60af40362ca561eadde9138284f0541c7f116568 100644 (file)
--- a/libraries/libavl/testavl.c
+++ b/libraries/libavl/testavl.c
@@ -1,29 +1,31 @@
 /* testavl.c - Test Tim Howes AVL code */
 
-#define DISABLE_BRIDGE
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
+
 #include <ac/string.h>
 #include <sys/types.h>
 
 #include "avl.h"
 
-main( argc, argv )
-int    argc;
-char   **argv;
+static void ravl_print LDAP_P(( Avlnode *root, int depth ));
+static void myprint LDAP_P(( Avlnode *root ));
+
+int
+main( int argc, char **argv )
 {
        Avlnode *tree = NULLAVL;
        char    command[ 10 ];
        char    name[ 80 ];
        char    *p;
-       int     free(), strcmp();
 
        printf( "> " );
        while ( fgets( command, sizeof( command ), stdin ) != NULL ) {
                switch( *command ) {
                case 'n':       /* new tree */
-                       ( void ) avl_free( tree, free );
+                       ( void ) avl_free( tree, (AVL_FREE) free );
                        tree = NULLAVL;
                        break;
                case 'p':       /* print */
@@ -41,7 +43,7 @@ char  **argv;
                        if ( fgets( name, sizeof( name ), stdin ) == NULL )
                                exit( 0 );
                        name[ strlen( name ) - 1 ] = '\0';
-                       if ( (p = (char *) avl_find( tree, name, strcmp ))
+                       if ( (p = (char *) avl_find( tree, name, (AVL_CMP) strcmp ))
                            == NULL )
                                printf( "Not found.\n\n" );
                        else
@@ -52,7 +54,7 @@ char  **argv;
                        if ( fgets( name, sizeof( name ), stdin ) == NULL )
                                exit( 0 );
                        name[ strlen( name ) - 1 ] = '\0';
-                       if ( avl_insert( &tree, strdup( name ), strcmp, 
+                       if ( avl_insert( &tree, strdup( name ), (AVL_CMP) strcmp, 
                            avl_dup_error ) != 0 )
                                printf( "\nNot inserted!\n" );
                        break;
@@ -61,7 +63,7 @@ char  **argv;
                        if ( fgets( name, sizeof( name ), stdin ) == NULL )
                                exit( 0 );
                        name[ strlen( name ) - 1 ] = '\0';
-                       if ( avl_delete( &tree, name, strcmp ) == NULL )
+                       if ( avl_delete( &tree, name, (AVL_CMP) strcmp ) == NULL )
                                printf( "\nNot found!\n" );
                        break;
                case 'q':       /* quit */
@@ -75,12 +77,11 @@ char        **argv;
 
                printf( "> " );
        }
-       /* NOTREACHED */
+
+       return( 0 );
 }
 
-static ravl_print( root, depth )
-Avlnode        *root;
-int    depth;
+static void ravl_print( Avlnode *root, int depth )
 {
        int     i;
 
@@ -91,20 +92,19 @@ int depth;
 
        for ( i = 0; i < depth; i++ )
                printf( "   " );
-       printf( "%s %d\n", root->avl_data, root->avl_bf );
+       printf( "%s %d\n", (char *) root->avl_data, root->avl_bf );
 
        ravl_print( root->avl_left, depth+1 );
 }
 
-myprint( root )
-Avlnode        *root;
+static void myprint( Avlnode *root )
 {
        printf( "********\n" );
 
        if ( root == 0 )
                printf( "\tNULL\n" );
        else
-               ( void ) ravl_print( root, 0 );
+               ravl_print( root, 0 );
 
        printf( "********\n" );
 }