1 files changed, 8 insertions, 16 deletions

diff --git a/command_line/CmdLine/Src/CLFileOps.c b/command_line/CmdLine/Src/CLFileOps.c
index be3c00c..a5976be 100644
--- a/command_line/CmdLine/Src/CLFileOps.c
+++ b/command_line/CmdLine/Src/CLFileOps.c
@@ -415,8 +415,7 @@ static int CompileEntry(File *file, Boolean *compiled) {
         return 1;
     }
 
-#line 835
-    OPTION_ASSERT(file->compiler);
+    OS_ASSERT(835, file->compiler);
 
     *compiled = 1;
     beginWork = OS_GetMilliseconds();
@@ -471,8 +470,7 @@ static void DumpFileAndPathInfo(void) {
     } else {
         for (i = 0; i < n; i++) {
             Path *path = Paths_GetPath(&FrameworkPaths, i);
-#line 961
-            OPTION_ASSERT(path != NULL);
+            OS_ASSERT(961, path != NULL);
 
             CLReport(85,
                      OS_PathSpecToString(path->spec, STSbuf, sizeof(STSbuf)),
@@ -483,8 +481,7 @@ static void DumpFileAndPathInfo(void) {
                 UInt16 j;
                 for (j = 0; j < Paths_Count(path->recursive); j++) {
                     Path *sub = Paths_GetPath(path->recursive, j);
-#line 976
-                    OPTION_ASSERT(sub);
+                    OS_ASSERT(976, sub);
                     CLReport(85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
                 }
             }
@@ -497,8 +494,7 @@ static void DumpFileAndPathInfo(void) {
         for (i = 0; i < n; i++) {
             char version[80];
             Paths_FWInfo *info = Frameworks_GetInfo(i);
-#line 993
-            OPTION_ASSERT(info);
+            OS_ASSERT(993, info);
 
             version[0] = 0;
             strcpy(version, "\t(");
@@ -522,8 +518,7 @@ static void DumpFileAndPathInfo(void) {
     } else {
         for (i = 0; i < Paths_Count(&gTarg->userPaths); i++) {
             Path *path = Paths_GetPath(&gTarg->userPaths, i);
-#line 1024
-            OPTION_ASSERT(path != NULL);
+            OS_ASSERT(1024, path != NULL);
 
             CLReport(85,
                      OS_PathSpecToString(path->spec, STSbuf, sizeof(STSbuf)),
@@ -534,8 +529,7 @@ static void DumpFileAndPathInfo(void) {
                 UInt16 j;
                 for (j = 0; j < Paths_Count(path->recursive); j++) {
                     Path *sub = Paths_GetPath(path->recursive, j);
-#line 1039
-                    OPTION_ASSERT(sub);
+                    OS_ASSERT(1039, sub);
                     CLReport(85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
                 }
             }
@@ -550,8 +544,7 @@ static void DumpFileAndPathInfo(void) {
 
     for (i = 0; i < Paths_Count(&gTarg->sysPaths); i++) {
         Path *path = Paths_GetPath(&gTarg->sysPaths, i);
-#line 1054
-        OPTION_ASSERT(path != NULL);
+        OS_ASSERT(1054, path != NULL);
 
         CLReport(85,
                  OS_PathSpecToString(path->spec, STSbuf, sizeof(STSbuf)),
@@ -562,8 +555,7 @@ static void DumpFileAndPathInfo(void) {
             UInt16 j;
             for (j = 0; j < Paths_Count(path->recursive); j++) {
                 Path *sub = Paths_GetPath(path->recursive, j);
-#line 1069
-                OPTION_ASSERT(sub);
+                OS_ASSERT(1069, sub);
                 CLReport(85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
             }
         }