/* testavl.c - Test Tim Howes AVL code */
-#include <sys/types.h>
-#include <stdio.h>
-#include "avl.h"
-char *strdup( s )
-char *s;
-{
- char *new;
+#include "portable.h"
+
+#include <stdio.h>
+#include <stdlib.h>
- if ( (new = (char *) malloc( strlen( s ) + 1 )) == NULL )
- return( NULL );
+#include <ac/string.h>
+#include <sys/types.h>
- strcpy( new, s );
+#include "avl.h"
- return( new );
-}
+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 ];
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 */
case 't': /* traverse with first, next */
printf( "***\n" );
for ( p = (char * ) avl_getfirst( tree );
- p != NULL; p = (char *) avl_getnext( tree, p ) )
+ p != NULL; p = (char *) avl_getnext( /* tree, p */ ) )
printf( "%s\n", p );
printf( "***\n" );
break;
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
if ( fgets( name, sizeof( name ), stdin ) == NULL )
exit( 0 );
name[ strlen( name ) - 1 ] = '\0';
- if ( avl_insert( &tree, strdup( name ), strcmp,
- avl_dup_error ) != OK )
+ if ( avl_insert( &tree, strdup( name ), (AVL_CMP) strcmp,
+ avl_dup_error ) != 0 )
printf( "\nNot inserted!\n" );
break;
case 'd': /* delete */
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 */
printf( "> " );
}
- /* NOTREACHED */
+
+ return( 0 );
}
-static ravl_print( root, depth )
-Avlnode *root;
-int depth;
+static void ravl_print( Avlnode *root, int depth )
{
int i;
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" );
}