*/}}
Browse Source

Fix return issues

YimingWu 1 year ago
parent
commit
be764a4aaf
2 changed files with 5 additions and 4 deletions
  1. 3 2
      la_data.c
  2. 2 2
      la_util.c

+ 3 - 2
la_data.c

@@ -4033,6 +4033,7 @@ laDiffCommandInst* la_NewDiffCommandInst(laDBInst* DBInst, laDBInst* Prev, laDBI
     laDiffCommandInst* dci=memAcquire(sizeof(laDiffCommandInst));
     dci->DBInst = DBInst; dci->OriginalPrev = Prev; dci->OriginalNext = Next;
     dci->BeforePrev = DBInst->Item.pPrev; dci->BeforeNext = DBInst->Item.pNext;
+    return dci;
 }
 laDBInst* la_GetDiffDBInst(laListHandle* NewAdded, laListHandle* Master, void* instance){
     if(!instance) return 0;
@@ -4126,8 +4127,8 @@ int la_GenerateListDifferences(laDBInst* dbi, laDBSubProp* dbp, laPropPack* pp,
 
     if(!New.pFirst){ dbp->Instances.pFirst=dbp->Instances.pLast=0; }
     
-    for(laDiffTemp* lip=NewDeleted.pFirst;lip;lip=lip->Item.pNext){
-        laDBInst* dbi=lip->p; lstAppendItem(&dc->RemovedInst, la_NewDiffCommandInst(dbi, lip->tPrev, lip->tNext));printf("deleted %x %x\n", dbi, dbi->OriginalInstance);
+    for(laDiffTemp* lip=NewDeleted.pFirst;lip;lip=lip->Item.pNext){printf("deleted %x %x\n", dbi, dbi->OriginalInstance);
+        laDBInst* dbi=lip->p; lstAppendItem(&dc->RemovedInst, la_NewDiffCommandInst(dbi, lip->tPrev, lip->tNext));
         memTake(dbi->OriginalInstance);
         //if(!dbi->Item.pPrev){dbp->Instances.pFirst=dbi->Item.pNext;}
         //if(!dbi->Item.pNext){dbp->Instances.pLast=dbi->Item.pPrev;}

+ 2 - 2
la_util.c

@@ -1206,9 +1206,9 @@ void la_ReferrerDeleted(void* This, laItemUserLinker* iul){
 }
 void memAssignRef(void* This, void** ptr, void* instance){
     laItemUserLinker* iul;
-    if(!This||!ptr) return;
+    if((!This)||(!ptr)) return;
     if(instance){
-        laUseDataBlock(instance, 0, 0, ptr, la_ReferencedBlockDeleted, 0)->Additional=This;
+        laItemUserLinker*iul=laUseDataBlock(instance, 0, 0, ptr, la_ReferencedBlockDeleted, 0); if(iul){iul->Additional=This;}
         laUseDataBlock(This, 0, 0, instance, la_ReferrerDeleted, 0);
     }else{
         laStopUsingDataBlock((*ptr), 0, This);