Timerix/DTLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

free() bugfix and test improvements

Browse Source
This commit is contained in:
Timerix22
2022-02-09 23:42:07 +03:00
parent 6a1eae90d9
commit 7150cda905
6 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DtsodC/src/SearchTree/SearchTree.c
View File

@@ -11,19 +11,17 @@ STNode* STNode_create(){
void STNode_free(STNode* node){
if (!node) throw(ERR_NULLPTR);
if(node->branches!=NULL){
if(node->branches){
for(uint8 n32 = 0;n32<8;n32++){
STNode*** ptrn32=(STNode***)node->branches[n32];
if(ptrn32!=NULL){
if(ptrn32){
for(uint8 n4 = 0;n4<8;n4++){
STNode** ptrn4=ptrn32[n4];
if (ptrn4!=NULL){
if (ptrn4){
for(uint8 rem=0;rem<4;rem++){
STNode* ptrrem=ptrn4[rem];
if(ptrrem!=NULL){
if(ptrrem)
STNode_free(ptrrem);
free(ptrrem);
}
}
free(ptrn4);
}
@@ -33,8 +31,9 @@ void STNode_free(STNode* node){
}
free(node->branches);
}
if(node->value.type==UInt8Ptr|Int8Ptr)
free(node->value.VoidPtr);
//if value is not freed ptr
if(node->value.type>12 && node->value.type<21 && node->value.VoidPtr)
free(node->value.VoidPtr);
free(node);
}
@@ -52,24 +51,24 @@ uint8 combinei3(indexes3 i3){
return i3.n32*32+i3.n4*8;
}
int16 globytes=0;
//int16 globytes=0;
void ST_push(STNode* node_first, const char* key, Unitype value){
if (!node_first) throw(ERR_NULLPTR);
int16 bytes=sizeof(Unitype);
//int16 bytes=sizeof(Unitype);
char c = *key;
STNode* node_last=node_first;
for (uint16 i=0;c!='\0';){
indexes3 i3=splitindex((uint8)c);
if(!node_last->branches){
node_last->branches=(STNode****)malloc(8*sizeof(STNode*));
bytes+=sizeof(void*)*8;
//bytes+=sizeof(void*)*8;
for(uint8 i=0;i<8;i++)
node_last->branches[i]=(STNode***)NULL;
}
STNode*** ptrn32=(STNode***)node_last->branches[i3.n32];
if(!ptrn32){
ptrn32=(STNode***)malloc(8*sizeof(STNode*));
bytes+=sizeof(void*)*8;
//bytes+=sizeof(void*)*8;
for(uint8 i=0;i<8;i++)
ptrn32[i]=(STNode**)NULL;
node_last->branches[i3.n32]=ptrn32;
@@ -77,7 +76,7 @@ void ST_push(STNode* node_first, const char* key, Unitype value){
STNode** ptrn4=ptrn32[i3.n4];
if(!ptrn4){
ptrn4=(STNode**)malloc(4*sizeof(STNode*));
bytes+=sizeof(void*)*4;
//bytes+=sizeof(void*)*4;
for(uint8 i=0;i<4;i++)
ptrn4[i]=(STNode*)NULL;
ptrn32[i3.n4]=ptrn4;
@@ -85,14 +84,14 @@ void ST_push(STNode* node_first, const char* key, Unitype value){
node_last=ptrn4[i3.rem];
if(!node_last){
node_last=STNode_create();
bytes+=sizeof(STNode);
//bytes+=sizeof(STNode);
ptrn4[i3.rem]=node_last;
}
c=*(key+(++i));
}
node_last->value=value;
globytes+=bytes;
dbg(globytes);
//globytes+=bytes;
//dbg(globytes);
}
const Unitype UnitypeNull={Null,.VoidPtr=NULL};

1
DtsodC/src/SearchTree/SearchTree.h
View File

@@ -8,7 +8,6 @@ typedef struct SearchTreeNode{
} STNode;
STNode* STNode_create(void);
//doesn't work!
void STNode_free(STNode* node);
void ST_push(STNode* node, const char* key, Unitype value);