Fixed multiple bugs in file and io.

aq-org · Jul 31, 2024 · 9958620 · 9958620
1 parent eed4720
commit 9958620
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/aqvm/base/file/file.c b/aqvm/base/file/file.c
@@ -80,7 +80,7 @@ int AqvmBaseFile_feof(struct AqvmBaseFile_File* stream) {
 }
 
 int AqvmBaseFile_ferror(struct AqvmBaseFile_File* stream) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || ferror(stream->file)) {
     // TODO
     return -1;
   }

diff --git a/aqvm/base/io/io.c b/aqvm/base/io/io.c
@@ -15,13 +15,13 @@
 AqvmBaseThreadingMutex_Mutex AqvmBaseIo_printMutex;
 
 struct AqvmBaseFile_File AqvmBaseIo_stdoutStream;
-extern struct AqvmBaseFile_File* AqvmBaseIo_stdout = &AqvmBaseIo_stdoutStream;
+struct AqvmBaseFile_File* AqvmBaseIo_stdout = &AqvmBaseIo_stdoutStream;
 
 struct AqvmBaseFile_File AqvmBaseIo_stdinStream;
-extern struct AqvmBaseFile_File* AqvmBaseIo_stdin = &AqvmBaseIo_stdinStream;
+struct AqvmBaseFile_File* AqvmBaseIo_stdin = &AqvmBaseIo_stdinStream;
 
 struct AqvmBaseFile_File AqvmBaseIo_stderrStream;
-extern struct AqvmBaseFile_File* AqvmBaseIo_stderr = &AqvmBaseIo_stderrStream;
+struct AqvmBaseFile_File* AqvmBaseIo_stderr = &AqvmBaseIo_stderrStream;
 
 int AqvmBaseIo_InitializeIo() {
   AqvmBaseIo_stdoutStream.file = stdout;
@@ -88,7 +88,7 @@ int AqvmBaseIo_fgetc(struct AqvmBaseFile_File* stream) {
   }
 
   if (result == EOF) {
-    if (AQvmBaseFile_feof(stream)) {
+    if (AqvmBaseFile_feof(stream)) {
       return EOF;
     }
     // TODO
@@ -417,7 +417,7 @@ int AqvmBaseIo_getc(struct AqvmBaseFile_File* stream) {
   }
 
   if (result == EOF) {
-    if (AQvmBaseFile_feof(stream)) {
+    if (AqvmBaseFile_feof(stream)) {
       return EOF;
     } else {
       // TODO
@@ -429,7 +429,7 @@ int AqvmBaseIo_getc(struct AqvmBaseFile_File* stream) {
 }
 
 int AqvmBaseIo_getchar(void) {
-  if (AqvmBaseFile_ferror(stdin)) {
+  if (AqvmBaseFile_ferror(AqvmBaseIo_stdin)) {
     // TODO
     return -2;
   }
@@ -556,7 +556,7 @@ int AqvmBaseIo_putc(int character, struct AqvmBaseFile_File* stream) {
 }
 
 int AqvmBaseIo_putchar(int character) {
-  if (AqvmBaseFile_ferror(stdout)) {
+  if (AqvmBaseFile_ferror(AqvmBaseIo_stdout)) {
     // TODO
     return -2;
   }