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 5e69e6f3f61dbc0d2f5a989270f6aaf67b54830b..60af40362ca561eadde9138284f0541c7f116568 100644 (file)
--- a/libraries/libavl/testavl.c
+++ b/libraries/libavl/testavl.c
@@ -13,9 +13,8 @@
 static void ravl_print LDAP_P(( Avlnode *root, int depth ));
 static void myprint LDAP_P(( Avlnode *root ));
 
-main( argc, argv )
-int    argc;
-char   **argv;
+int
+main( int argc, char **argv )
 {
        Avlnode *tree = NULLAVL;
        char    command[ 10 ];
@@ -26,7 +25,7 @@ char  **argv;
        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 */
@@ -44,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
@@ -55,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;
@@ -64,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 */
@@ -78,7 +77,8 @@ char  **argv;
 
                printf( "> " );
        }
-       /* NOTREACHED */
+
+       return( 0 );
 }
 
 static void ravl_print( Avlnode *root, int depth )
@@ -92,7 +92,7 @@ static void ravl_print( Avlnode *root, 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 );
 }