projects
/
tedtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add simple template library
[tedtools.git]
/
sfxstr.c
diff --git
a/sfxstr.c
b/sfxstr.c
index
c107e60
..
4a4e4da
100644
(file)
--- a/
sfxstr.c
+++ b/
sfxstr.c
@@
-149,20
+149,28
@@
SFSFindData(SFSTree *info, char *word, int len) {
in.key = word;
in.keylen = len;
in.key = word;
in.keylen = len;
- return SFSFindDataOrSave(info, &in, NULL);
+ return SFSFindData
FromSaved
OrSave(info, &in, NULL);
}
void*
SFSFindDataOrSave(SFSTree *info, SFSDataIO *in, SFSTreePosition *position) {
}
void*
SFSFindDataOrSave(SFSTree *info, SFSDataIO *in, SFSTreePosition *position) {
+ if ( position )
+ memset(position, 0, sizeof(position));
+
+ return SFSFindDataFromSavedOrSave(info, in, position);
+}
+
+void*
+SFSFindDataFromSavedOrSave(SFSTree *info, SFSDataIO *in, SFSTreePosition *position) {
SFSNode *node = info->node;
SFSNode **pnode = &(info->node);
SFSNodeData *StopLow, *StopHigh, *StopMiddle;
u_int8_t *ptr =(u_int8_t*)in->key;
SFSNode *node = info->node;
SFSNode **pnode = &(info->node);
SFSNodeData *StopLow, *StopHigh, *StopMiddle;
u_int8_t *ptr =(u_int8_t*)in->key;
- if ( position ) {
-
position->nodeptr = NULL
;
- p
osition->node = NULL
;
- p
osition->level = 0
;
+ if ( position
&& position->nodeptr && position->node && in->keylen > position->level
) {
+
node = position->node
;
+ p
node = position->nodeptr
;
+ p
tr += position->level
;
}
while( node && !ISEND(ptr, in->key, in->keylen) ) {
}
while( node && !ISEND(ptr, in->key, in->keylen) ) {
@@
-173,7
+181,7
@@
SFSFindDataOrSave(SFSTree *info, SFSDataIO *in, SFSTreePosition *position) {
}
if ( node->isskip ) {
}
if ( node->isskip ) {
- if ( in->keylen>0 && in->keylen - (((char*)ptr) - in->key)
>
node->nchar )
+ if ( in->keylen>0 && in->keylen - (((char*)ptr) - in->key)
<
node->nchar )
return NULL;
else if ( STRNCMP(ptr, ((char*)node)+node->dataptr, node->nchar) ) {
ptr+=node->nchar;
return NULL;
else if ( STRNCMP(ptr, ((char*)node)+node->dataptr, node->nchar) ) {
ptr+=node->nchar;
@@
-626,11
+634,11
@@
addRecord(SFSTree *info, SFSNode* node, SFSDataIO *in, int level) {
else
node = splitSkipNode(info, node, in, level);
} else {
else
node = splitSkipNode(info, node, in, level);
} else {
-
StopLow = node->data;
+ StopLow = node->data;
StopHigh = StopLow + node->nchar;
while (StopLow < StopHigh) {
StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
StopHigh = StopLow + node->nchar;
while (StopLow < StopHigh) {
StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
-
if ( StopMiddle->val == *ptr ) {
+ if ( StopMiddle->val == *ptr ) {
if ( *(ptr+1)=='\0' ) {
if ( StopMiddle->isword ) {
/* already exists */
if ( *(ptr+1)=='\0' ) {
if ( StopMiddle->isword ) {
/* already exists */