Factorize file pointer check

2024-01-30 18:11:10 +01:00
parent 1a5a7d67a7
commit 2b97735d5d
4 changed files with 32 additions and 25 deletions
--- a/libsrc/common/fputc.s
+++ b/libsrc/common/fputc.s
@@ -6,7 +6,7 @@

        .export         _fputc
        .importzp       ptr1
-        .import         _write
+        .import         _write, checkferror
        .import         pushax, pusha0, popax, incsp2
        .import         pushptr1, popptr1, returnFFFF

@@ -21,13 +21,7 @@ _fputc:
        sta     c               ; to return it anyway
        stx     c+1

-        ldy     #_FILE::f_flags
-        lda     (ptr1),y
-        tax
-        and     #_FOPEN         ; Check for file open
-        beq     ret_eof
-        txa
-        and     #(_FERROR|_FEOF); Check for error/eof
+        jsr     checkferror
        bne     ret_eof

        jsr     pushptr1        ; Backup fp pointer