diff options
| author | Ash Wolf <ninji@wuffs.org> | 2023-01-11 23:26:04 +0000 |
|---|---|---|
| committer | Ash Wolf <ninji@wuffs.org> | 2023-01-11 23:26:04 +0000 |
| commit | 54bb1363a26b6a52cf1a8ecf1f16f76e9920956f (patch) | |
| tree | 53644f3d0a9b24a10275ba723f6e7e43aee00ec9 /command_line/CmdLine/Src/MacEmul | |
| parent | 0bec4f557a96e1a40437cf5af20cc78a5eec8a63 (diff) | |
| download | MWCC-54bb1363a26b6a52cf1a8ecf1f16f76e9920956f.tar.gz MWCC-54bb1363a26b6a52cf1a8ecf1f16f76e9920956f.zip | |
get it to compile with clang
Diffstat (limited to 'command_line/CmdLine/Src/MacEmul')
| -rw-r--r-- | command_line/CmdLine/Src/MacEmul/Files.c | 3 | ||||
| -rw-r--r-- | command_line/CmdLine/Src/MacEmul/Resources.c | 13 |
2 files changed, 6 insertions, 10 deletions
diff --git a/command_line/CmdLine/Src/MacEmul/Files.c b/command_line/CmdLine/Src/MacEmul/Files.c index a613b4a..02760e7 100644 --- a/command_line/CmdLine/Src/MacEmul/Files.c +++ b/command_line/CmdLine/Src/MacEmul/Files.c @@ -672,8 +672,7 @@ OSErr FSMakeFSSpec(SInt16 vRefNum, SInt32 dirID, ConstStr255Param pathName, FSSp } OS_PathSpecToString(&spec.path, path, 256); } else { -#line 840 - OPTION_ASSERT(vRefNum!=0); + OS_ASSERT(840, vRefNum!=0); tmpfss.vRefNum = vRefNum; tmpfss.parID = dirID ? dirID : 2; tmpfss.name[0] = 0; diff --git a/command_line/CmdLine/Src/MacEmul/Resources.c b/command_line/CmdLine/Src/MacEmul/Resources.c index 821df0b..1563898 100644 --- a/command_line/CmdLine/Src/MacEmul/Resources.c +++ b/command_line/CmdLine/Src/MacEmul/Resources.c @@ -568,8 +568,7 @@ static void WriteResourceFork(SInt16 ref) { mrle = mtyp->ref_list; while (mrle) { -#line 943 - OPTION_ASSERT(reflist_offs < dmap.namelist_offs); + OS_ASSERT(943, reflist_offs < dmap.namelist_offs); drle.id = mrle->id; drle.name_offs = (mrle->name) ? name_offs : -1; @@ -583,18 +582,16 @@ static void WriteResourceFork(SInt16 ref) { reflist_offs += sizeof(trle); if (mrle->name) { -#line 962 if (dhdr.map_offs < dhdr.data_offs) - OPTION_ASSERT(name_offs + dmap.namelist_offs + dhdr.map_offs < dhdr.data_offs); + OS_ASSERT(963, name_offs + dmap.namelist_offs + dhdr.map_offs < dhdr.data_offs); RF_HANDLE_INSERT(hand_ref, mrle->name, dhdr.map_offs + dmap.namelist_offs + drle.name_offs, mrle->name[0] + 1); name_offs += mrle->name[0] + 1; } -#line 970 - OPTION_ASSERT(data_offs < dhdr.data_len); - OPTION_ASSERT(mrle->hand!=NULL); + OS_ASSERT(970, data_offs < dhdr.data_len); + OS_ASSERT(971, mrle->hand!=NULL); if (dhdr.map_offs > dhdr.data_offs) - OPTION_ASSERT(data_offs + dhdr.data_offs < dhdr.map_offs); + OS_ASSERT(973, data_offs + dhdr.data_offs < dhdr.map_offs); HLock(mrle->hand); dent.len = GetHandleSize(mrle->hand); |