|
@@ -3889,7 +3889,7 @@ void la_FreeDifference(laDiff* d, int FromLeft){
|
|
while(dc=lstPopItem(&d->Commands)){ la_FreeDiffCommand(dc,d,FromLeft); }
|
|
while(dc=lstPopItem(&d->Commands)){ la_FreeDiffCommand(dc,d,FromLeft); }
|
|
while(dcc=lstPopItem(&d->CustomCommands)){ if(dcc->Free) dcc->Free(dcc->Data, FromLeft); }
|
|
while(dcc=lstPopItem(&d->CustomCommands)){ if(dcc->Free) dcc->Free(dcc->Data, FromLeft); }
|
|
while(det=lstPopItem(&d->ExtraTouched)){ memFree(det); }
|
|
while(det=lstPopItem(&d->ExtraTouched)){ memFree(det); }
|
|
- if(d->Description&&d->Description->Ptr){printf("%s\n",d->Description->Ptr);}
|
|
|
|
|
|
+ //if(d->Description&&d->Description->Ptr){printf("%s\n",d->Description->Ptr);}
|
|
strSafeDestroy(&d->Description);
|
|
strSafeDestroy(&d->Description);
|
|
}
|
|
}
|
|
void laFreeNewerDifferences(){
|
|
void laFreeNewerDifferences(){
|
|
@@ -4004,7 +4004,7 @@ int la_AddStringDBProp(laDBInst* dbi, laDBProp* dbp, laDiff* diff, laPropPack *p
|
|
}
|
|
}
|
|
int la_AddEnumDBProp(laDBInst* dbi, laDBProp* dbp, laDiff* diff, laPropPack *pp){
|
|
int la_AddEnumDBProp(laDBInst* dbi, laDBProp* dbp, laDiff* diff, laPropPack *pp){
|
|
laProp *p = pp->LastPs->p; laEnumItem **Data=0; int len = laGetArrayLength(pp); int ret=0;
|
|
laProp *p = pp->LastPs->p; laEnumItem **Data=0; int len = laGetArrayLength(pp); int ret=0;
|
|
- Data= memAcquireSimple(sizeof(laEnumItem*)*len); printf("len %s %d\n",p->Identifier,len);
|
|
|
|
|
|
+ Data= memAcquireSimple(sizeof(laEnumItem*)*len);
|
|
laGetEnumArray(pp, Data); if(diff&&dbp){
|
|
laGetEnumArray(pp, Data); if(diff&&dbp){
|
|
if(memcmp(dbp->Data, Data, sizeof(laEnumItem*)*len)){ la_GiveDiffCommand(diff, dbi, p, dbp->Data); dbp->Data=Data; ret=1; } else memFree(Data);
|
|
if(memcmp(dbp->Data, Data, sizeof(laEnumItem*)*len)){ la_GiveDiffCommand(diff, dbi, p, dbp->Data); dbp->Data=Data; ret=1; } else memFree(Data);
|
|
}else laAddDBProp(dbi, p, Data);
|
|
}else laAddDBProp(dbi, p, Data);
|