Apple-2-Tools
/
nulib2
mirror of https://github.com/fadden/nulib2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a bug in Nu_RecordSet_MoveAllRecords() that left origRecordSet in 

an unhappy state after deleting a record.  Added a bunch of asserts to
catch similar problems in the future.
This commit is contained in:
Andy McFadden 2003-02-23 01:09:20 +00:00
parent e546f96f9a
commit 104f34629c
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nufxlib-0/Deferred.c
View File

@ -2511,6 +2511,12 @@ bail:
*pStatusFlags |= kNuFlushReadOnly;
}
}
/* last-minute sanity check */
Assert(pArchive->origRecordSet.numRecords == 0 ||
(pArchive->origRecordSet.nuRecordHead != nil &&
pArchive->origRecordSet.nuRecordTail != nil));
return err;
}

35
nufxlib-0/Record.c
View File

@ -349,6 +349,7 @@ Nu_RecordSet_FreeAllRecords(NuArchive* pArchive, NuRecordSet* pRecordSet)
if (!pRecordSet->loaded) {
Assert(pRecordSet->nuRecordHead == nil);
Assert(pRecordSet->nuRecordTail == nil);
Assert(pRecordSet->numRecords == 0);
return kNuErrNone;
}
@ -545,19 +546,29 @@ Nu_RecordSet_MoveAllRecords(NuArchive* pArchive, NuRecordSet* pDstSet,
return kNuErrNone;
#endif
if (pDstSet->nuRecordHead == nil) {
/* empty dst list */
pDstSet->nuRecordHead = pSrcSet->nuRecordHead;
pDstSet->nuRecordTail = pSrcSet->nuRecordTail;
pDstSet->numRecords = pSrcSet->numRecords;
pDstSet->loaded = true;
/* move records over */
if (Nu_RecordSet_GetNumRecords(pSrcSet)) {
Assert(pSrcSet->nuRecordHead != nil);
Assert(pSrcSet->nuRecordTail != nil);
if (pDstSet->nuRecordHead == nil) {
/* empty dst list */
Assert(pDstSet->nuRecordTail == nil);
pDstSet->nuRecordHead = pSrcSet->nuRecordHead;
pDstSet->nuRecordTail = pSrcSet->nuRecordTail;
pDstSet->numRecords = pSrcSet->numRecords;
pDstSet->loaded = true;
} else {
/* append to dst list */
Assert(pDstSet->loaded);
Assert(pDstSet->nuRecordTail != nil);
pDstSet->nuRecordTail->pNext = pSrcSet->nuRecordHead;
pDstSet->nuRecordTail = pSrcSet->nuRecordTail;
pDstSet->numRecords += pSrcSet->numRecords;
}
} else {
/* append to dst list */
Assert(pDstSet->loaded);
Assert(pDstSet->nuRecordTail != nil);
pDstSet->nuRecordTail->pNext = pSrcSet->nuRecordHead;
pDstSet->nuRecordTail = pSrcSet->nuRecordTail;
pDstSet->numRecords += pSrcSet->numRecords;
/* no records in src set */
Assert(pSrcSet->nuRecordHead == nil);
Assert(pSrcSet->nuRecordTail == nil);
}
/* nuke all pointers in original list */