projects
/
vg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify gitignore
[vg.git]
/
src
/
vg
/
vg_store.h
diff --git
a/src/vg/vg_store.h
b/src/vg/vg_store.h
index 075695ecca95181dff3ff854f1fa4e0c2b6d8b02..ee0e91acf04d3e94579b1f62c7dfafda8d322a9d 100644
(file)
--- a/
src/vg/vg_store.h
+++ b/
src/vg/vg_store.h
@@
-3,12
+3,15
@@
#include "vg_stdint.h"
#include "vg_io.h"
#include "vg_stdint.h"
#include "vg_io.h"
+#include "vg_log.h"
/*
* Anderson tree implementation with extensions:
* parents are kept track of
* duplicates are allowed
* data is never allocated or destroyed here
/*
* Anderson tree implementation with extensions:
* parents are kept track of
* duplicates are allowed
* data is never allocated or destroyed here
+ *
+ * TODO: seperate offset,stride,base into 'generic array', seperate pool
*/
typedef struct aatree aatree;
*/
typedef struct aatree aatree;
@@
-560,10
+563,10
@@
static void aatree_show_r( aatree *tree, aatree_ptr t, int lvl,
for( int i=0; i<lvl; i++ )
{
for( int i=0; i<lvl; i++ )
{
- vg_
log
( " " );
+ vg_
info
( " " );
}
p_show( data );
}
p_show( data );
- vg_
log
( " (%d) \n", t );
+ vg_
info
( " (%d) \n", t );
aatree_show_r( tree, ptnode->right, lvl+1, p_show );
}
aatree_show_r( tree, ptnode->right, lvl+1, p_show );
}
@@
-579,10
+582,10
@@
static void aatree_show( aatree *tree, aatree_ptr t, void(*p_show)(void *data))
for( int i=0; i<ptnode->level; i++ )
{
for( int i=0; i<ptnode->level; i++ )
{
- vg_
log
( " " );
+ vg_
info
( " " );
}
p_show( data );
}
p_show( data );
- vg_
log
( " (%d) \n", t );
+ vg_
info
( " (%d) \n", t );
aatree_show( tree, ptnode->right, p_show );
}
aatree_show( tree, ptnode->right, p_show );
}
@@
-601,7
+604,7
@@
static void aatree_show_counts( aatree *tree, aatree_ptr t, int lvl, int *ln,
aatree_show_counts( tree, ptnode->left, lvl+1, ln, err, p_show, show );
aatree_show_counts( tree, ptnode->left, lvl+1, ln, err, p_show, show );
- if( show ) vg_
log
( "%03d| ", *ln );
+ if( show ) vg_
info
( "%03d| ", *ln );
*ln = *ln +1;
if( show )
*ln = *ln +1;
if( show )
@@
-627,7
+630,7
@@
static void aatree_show_counts( aatree *tree, aatree_ptr t, int lvl, int *ln,
if( !aatree_verify( tree, t ) )
{
if( show )
if( !aatree_verify( tree, t ) )
{
if( show )
- vg_
log
( "error\n" );
+ vg_
info
( "error\n" );
*err = 1;
}
*err = 1;
}