Some code cleanup.

MockbaTheBorg · Jul 5, 2024 · b3a4c8c · b3a4c8c
1 parent 96558fb
commit b3a4c8c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/RunCPM/abstraction_posix.h b/RunCPM/abstraction_posix.h
@@ -613,15 +613,15 @@ static void _parse_options(int argc, char *argv[]) {
 }
 #endif
 
-void _host_init(int argc, char* argv[]) {
 #ifdef STREAMIO
+void _host_init(int argc, char* argv[]) {
 	_parse_options(argc, argv);
-#endif
 	if (chdir(dirname(argv[0]))) {
 		_file_failure_exit(argv, "error performing chdir(%s)",
 			dirname(argv[0]));
 	}
 }
+#endif
 
 /* Console abstraction functions */
 /*===============================================================================*/

diff --git a/RunCPM/abstraction_vstudio.h b/RunCPM/abstraction_vstudio.h
@@ -613,11 +613,11 @@ static void _parse_options(int argc, char *argv[]) {
 }
 #endif
 
-void _host_init(int argc, char* argv[]) {
 #ifdef STREAMIO
+void _host_init(int argc, char* argv[]) {
 	_parse_options(argc, argv);
-#endif
 }
+#endif
 
 /* Console abstraction functions */
 /*===============================================================================*/

diff --git a/RunCPM/ccp.h b/RunCPM/ccp.h
@@ -89,7 +89,7 @@ uint8 _ccp_cnum(void) {
     return (result);
 } // _ccp_cnum
 
-// Returns true if character is a separator
+// Returns true if character is a delimiter
 uint8 _ccp_delim(uint8 ch) {
     return (ch == 0 || ch == ' ' || ch == '=' || ch == '.' || ch == ':' || ch == ';' || ch == '<' || ch == '>');
 }
@@ -100,8 +100,8 @@ void _ccp_printfcb(uint16 fcb, uint8 compact) {
 
     ch = _RamRead(fcb);
     if (ch && compact) {
-        _ccp_bdos(	C_WRITE,	ch + '@');
-        _ccp_bdos(	C_WRITE,	':');
+        _ccp_bdos(C_WRITE,	ch + '@');
+        _ccp_bdos(C_WRITE,	':');
     }
 
     for (i = 1; i < 12; ++i) {
@@ -250,12 +250,12 @@ void _ccp_era(void) {
 } // _ccp_era
 
 // TYPE command
-uint8 _ccp_type(void) {
+void _ccp_type(void) {
     uint8 i, c, l = 0, error = TRUE;
     uint16 a, p = 0;
 
+    _puts("\r\n");
     if (!_ccp_bdos(F_OPEN, ParFCB)) {
-        _puts("\r\n");
 
         while (!_ccp_bdos(F_READ, ParFCB)) {
             i = 128;
@@ -282,8 +282,9 @@ uint8 _ccp_type(void) {
                 break;
         }
         error = FALSE;
+    } else {
+        _puts("No file");
     }
-    return (error);
 } // _ccp_type
 
 // SAVE command
@@ -835,7 +836,7 @@ void _ccp(void) {
                 }
 
                 case 2: {           // TYPE
-                    i = _ccp_type();
+                    _ccp_type();
                     break;
                 }
 

diff --git a/RunCPM/cpm.h b/RunCPM/cpm.h
@@ -1051,12 +1051,6 @@ void _Bdos(void) {
                     last[j] = _RamRead((chrsCntIdx + j) & 0xFFFF);
                 }
             }
-#if 0
-            printf("\n\r chrsMaxIdx: %0X, chrsMax: %u, chrsCnt: %u", chrsMaxIdx, chrsMax, chrsCnt);
-            for (j = 0; j < chrsCnt + 2; j++) {
-                printf("\n\r chrsMaxIdx[%u]: %0.2x", j, last[j]);
-            }
-#endif
             _putcon('\r');          // Gives a visual feedback that read ended
 			break;
 		}

diff --git a/RunCPM/main.c b/RunCPM/main.c
@@ -60,8 +60,8 @@ int main(int argc, char* argv[]) {
 	_sys_deletefile((uint8*)LogName);
 #endif
 
-	_host_init(argc, &argv[0]);
 #ifdef STREAMIO
+	_host_init(argc, &argv[0]);
 	_streamioInit();
 #endif
 	_console_init();